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

Don't call yarn directly in jenkins-jobs. #259

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jobs/demo-district-update-pass.groovy
Original file line number Diff line number Diff line change
@@ -40,13 +40,13 @@ BUILD_NAME = "build demo-district-password-update";
def _setupWebapp() {
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", params.CYPRESS_GIT_REVISION);
dir("webapp/services/static") {
sh("yarn install");
sh("make npm_deps");
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, John, for fixing it!

}
}

def runScript() {
def workDir = "webapp/services/static/javascript/districts-package/__e2e-tests__";
def runCypressArgs = ["yarn",
def runCypressArgs = ["./dev/tools/run_pkg_script.sh",
"cypress",
"run",
"--spec",
2 changes: 1 addition & 1 deletion jobs/e2e-test-cycloud.groovy
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ def _setupWebapp() {
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", GIT_SHA1);

dir("webapp/services/static") {
sh("yarn install --frozen-lockfile");
sh("make npm_deps");
}
}

4 changes: 2 additions & 2 deletions jobs/e2e-test.groovy
Original file line number Diff line number Diff line change
@@ -162,7 +162,7 @@ def _setupWebapp() {
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", GIT_SHA1);

dir("webapp/services/static") {
sh("yarn install --frozen-lockfile");
sh("make npm_deps");
}
}

@@ -193,7 +193,7 @@ def runLambdaTest() {
fastlyComputeEnvironmentCookie = "ZTM3YmE2YTFjNDZkZjEwMDYxMTM3NzQyM2VlYjgw"
}

def runLambdaTestArgs = ["yarn",
def runLambdaTestArgs = ["./dev/tools/run_pkg_script.sh",
"lambdatest",
"--envs='FASTLY_COMPUTE_ENVIRONMENT_COOKIE=${fastlyComputeEnvironmentCookie}'",
"--cy='--config baseUrl=\"${E2E_URL}\",retries=${params.TEST_RETRIES}'",
4 changes: 2 additions & 2 deletions weekly-maintenance-jobs.sh
Original file line number Diff line number Diff line change
@@ -321,15 +321,15 @@ update_caniuse() {
# https://github.com/facebook/create-react-app/issues/6708#issuecomment-488392836
(
cd webapp
for d in `git grep -l caniuse-lite "*yarn.lock" | xargs -n1 dirname`; do
for d in `git grep -l caniuse-lite "*yarn.lock" "*pnpm-lock.yaml" | xargs -n1 dirname`; do
(
cd "$d"
# Use the official tool to update the browserslist and caniuse-lite packages.
npx update-browserslist-db@latest
)
done
)
jenkins-jobs/safe_git.sh commit_and_push webapp -m "Automatic update of caniuse, via $0" '*/yarn.lock'
jenkins-jobs/safe_git.sh commit_and_push webapp -m "Automatic update of caniuse, via $0" '*/yarn.lock' '*/pnpm-lock.yaml'
}