Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Bump web to v4.5.0 #2780

Merged
merged 8 commits into from
Nov 17, 2021
Merged

[full-ci] Bump web to v4.5.0 #2780

merged 8 commits into from
Nov 17, 2021

Conversation

pascalwengerter
Copy link
Contributor

Description

Works towards #2766

cp -r "$WEB_PATH"/tests/acceptance/stepDefinitions "$testFolder"
cp "$WEB_PATH"/tests/acceptance/setup.js "$testFolder"
cp -r "$WEB_PATH"/tests/acceptance/* "$testFolder"
rm -r $testFolder/node_modules
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we do cp -r !(node_modules) "$WEB_PATH"/tests/acceptance/* or the likes instead of copying and removing those gazillion files? :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, and also I think we don't need one yarn install in drone

.drone.star Outdated
@@ -751,6 +755,9 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
"cd /srv/app/web",
"git checkout $WEB_COMMITID",
"yarn install --immutable",
"yarn build",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@individual-it not sure if we need to build web here btw, just added it since it seemed like it was missing yet tests passed before without problems apparently

@@ -46,7 +46,7 @@ clean_up() {

trap clean_up SIGHUP SIGINT SIGTERM EXIT

cp -r "$WEB_PATH"/tests "$testFolder"
cp -r $(ls -d "$WEB_PATH"/tests/acceptance/* | grep -v 'node_modules') "$testFolder"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess we should also omit all the files in .yarn from being copied here

@@ -40,7 +40,7 @@ clean_up() {

trap clean_up SIGHUP SIGINT SIGTERM EXIT

cp -r "$WEB_PATH"/tests "$testFolder"
cp -r $(ls -d "$WEB_PATH"/tests/acceptance/* | grep -v 'node_modules') "$testFolder"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess we should also omit all the files in .yarn from being copied here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.yarn will not be copied with that command because it will only copy the output of ls -d (no -a in the ls command)

@@ -47,6 +47,7 @@
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-replace": "^2.3.0",
"archiver": "^5.3.0",
"chromedriver": "^93.0.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that one coming from the tests/acceptance/package.json ? (the same would apply for settings/package.json)

@sonarcloud
Copy link

sonarcloud bot commented Nov 17, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@wkloucek wkloucek merged commit 3cd5d52 into master Nov 17, 2021
@delete-merged-branch delete-merged-branch bot deleted the update-web-4.5.0 branch November 17, 2021 13:49
ownclouders pushed a commit that referenced this pull request Nov 17, 2021
Merge: 7de4616 d2395f5
Author: Willy Kloucek <[email protected]>
Date:   Wed Nov 17 14:49:23 2021 +0100

    Merge pull request #2780 from owncloud/update-web-4.5.0

    [full-ci] Bump web to v4.5.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants