Skip to content

CI: Fix diff checks for testing chores steps #7132

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.

Sign up for GitHub

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

Open
clemyan wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −11
Open

CI: Fix diff checks for testing chores steps #7132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .github/workflows/integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: 'Check that the cache files are consistent with their remote sources'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- '.yarn/cache' 'packages/yarnpkg-libzip' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- '.yarn/cache' 'packages/yarnpkg-libzip'; then
node ./scripts/run-yarn.js --immutable --immutable-cache --check-cache
fi
shell: bash
Expand Down Expand Up @@ -67,9 +67,9 @@ jobs:

- name: 'Check that libzip artifacts are consistent with a fresh build (fix w/ "git merge master && bash packages/yarnpkg-libzip/artifacts/build.sh")'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- 'packages/yarnpkg-libzip/artifacts' 'packages/yarnpkg-libzip/sources/*.js' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- 'packages/yarnpkg-libzip/artifacts' 'packages/yarnpkg-libzip/sources/*.js'; then
bash packages/yarnpkg-libzip/artifacts/build.sh
[[ $(git diff --name-only 'packages/yarnpkg-libzip/artifacts' 'packages/yarnpkg-libzip/sources/*.js' | wc -l) -eq 0 ]]
git diff --exit-code 'packages/yarnpkg-libzip/artifacts' 'packages/yarnpkg-libzip/sources/*.js'
fi
shell: bash
if: |
Expand All @@ -79,9 +79,9 @@ jobs:

- name: 'Check that the PnP hooks are consistent with a fresh build (fix w/ "git merge master && yarn update:pnp:hook")'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- 'packages/yarnpkg-{fslib,libzip,pnp}/sources/**/*' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- 'packages/yarnpkg-fslib/sources' 'packages/yarnpkg-libzip/sources' 'packages/yarnpkg-pnp/sources'; then
node ./scripts/run-yarn.js build:pnp:hook
[[ $(git diff --name-only packages/yarnpkg-pnp/sources/{hook.js,esm-loader/built-loader.js} | wc -l) -eq 0 ]]
git diff --exit-code -- 'packages/yarnpkg-pnp/sources/hook.js' 'packages/yarnpkg-pnp/sources/esm-loader/built-loader.js'
fi
shell: bash
if: |
Expand All @@ -91,9 +91,9 @@ jobs:

- name: 'Check that the Zip worker is consistent with a fresh build (fix w/ "git merge master && yarn update:zip:worker")'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- 'packages/yarnpkg-{fslib,libzip,core}/sources/**/*' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- 'packages/yarnpkg-fslib/sources' 'packages/yarnpkg-libzip/sources' 'packages/yarnpkg-core/sources'; then
node ./scripts/run-yarn.js build:zip:worker
[[ $(git diff --name-only packages/yarnpkg-core/sources/worker-zip/index.js | wc -l) -eq 0 ]]
git diff --exit-code -- 'packages/yarnpkg-core/sources/worker-zip/index.js'
fi
shell: bash
if: |
Expand All @@ -103,9 +103,9 @@ jobs:

- name: 'Check that the pluginCommands file is consistent with a fresh build (fix w/ "yarn build:plugin-commands")'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- packages/yarnpkg-cli/sources/pluginCommands.ts 'packages/*/sources/commands/**/*' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- 'packages/yarnpkg-cli/sources/pluginCommands.ts' ':(glob)packages/*/sources/commands'; then
node ./scripts/run-yarn.js build:plugin-commands
[[ $(git diff --name-only packages/yarnpkg-cli/sources/pluginCommands.ts | tee /dev/stderr | wc -l) -eq 0 ]]
git diff --exit-code -- 'packages/yarnpkg-cli/sources/pluginCommands.ts'
fi
shell: bash
if: |
Expand All @@ -115,9 +115,9 @@ jobs:

- name: 'Check that the grammars are consistent with fresh builds (fix w/ "yarn grammar:all")'
run: |
if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- 'packages/yarnpkg-parsers/sources/grammars/*.{pegjs,js}' | wc -l) -gt 0 ]]; then
if ! git diff --quiet --merge-base origin/"$TARGET_BRANCH" HEAD -- 'packages/yarnpkg-parsers/sources/grammars/*.pegjs' 'packages/yarnpkg-parsers/sources/grammars/*.js'; then
node ./scripts/run-yarn.js grammar:all
[[ $(git diff --name-only packages/yarnpkg-parsers/sources/grammars/*.js | tee /dev/stderr | wc -l) -eq 0 ]]
git diff --exit-code -- 'packages/yarnpkg-parsers/sources/grammars/*.js'
fi
shell: bash
if: |
Expand Down
Loading