Skip to content

Commit cdb859e

Browse files
alan-agius4clydin
authored andcommitted
ci: several fixes of PR CI runs
Currently, the Renovate PRs will run the full E2E suit on WIndows because `CIRCLE_PR_NUMBER` is not defined for PRs which are opened from non forked repos. Instead we replace it with `CIRCLE_PULL_REQUEST` which is always defined. Also, such non forked PRs will cause uploading of Bazel result in remote cache. This is now disabled. Example runs: https://app.circleci.com/pipelines/github/angular/angular-cli/15228/workflows/4bf31046-3317-4422-bf57-5156eef69259/jobs/245137 (cherry picked from commit f4baa06)
1 parent 23f9c99 commit cdb859e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ commands:
9797
openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${<< parameters.key >>}" -out /home/circleci/.gcp_credentials;
9898
sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
9999
# Upload/don't upload local results to cache based on environment
100-
if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
100+
if [[ -n "{$CIRCLE_PULL_REQUEST}" ]]; then
101101
sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
102102
echo "Not uploading local build results to remote cache.";
103103
else
@@ -287,7 +287,7 @@ jobs:
287287
- run:
288288
name: Execute E2E Tests
289289
command: |
290-
if (Test-Path env:CIRCLE_PR_NUMBER) {
290+
if (Test-Path env:CIRCLE_PULL_REQUEST) {
291291
node tests\legacy-cli\run_e2e.js "--glob={tests/basic/**,tests/i18n/extract-ivy*.ts,tests/build/profile.ts}" --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
292292
} else {
293293
node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX

0 commit comments

Comments
 (0)