Skip to content

Fix back-merge dependency installation order #87

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

Merged
alexphillips-dev merged 1 commit into from
Aug 27, 2026
+7 −8
Merged

Fix back-merge dependency installation order #87

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions .github/workflows/backmerge-main-to-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ jobs:
- name: Setup CI environment
uses: ./.github/actions/setup-ci-env

- name: Install Node validation dependencies
run: npm ci --ignore-scripts

- name: Configure git identity
run: |
git config user.name "github-actions[bot]"
Expand All @@ -43,6 +40,9 @@ jobs:
run: |
bash scripts/sync_main_to_dev.sh

- name: Install merged dev validation dependencies
run: npm ci --ignore-scripts

- name: Rebuild synchronized dev package
run: |
chmod +x scripts/prepare_backmerge_dev_package.sh
Expand Down
4 changes: 2 additions & 2 deletions scripts/workflow_self_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ if (!/upload-artifact@[0-9a-f]{40}\s+# v7/.test(backmergeWorkflow)) {
if (!/FVPLUS_EXPECT_PLUGIN_BRANCH:\s*'dev'/.test(backmergeWorkflow)) {
fail('Back-merge workflow must validate merged dev state with FVPLUS_EXPECT_PLUGIN_BRANCH set to dev.');
}
if (!/Install Node validation dependencies[\s\S]*npm ci --ignore-scripts/.test(backmergeWorkflow)) {
fail('Back-merge workflow must install locked Node validation dependencies before running the full suite.');
if (!/Sync main into dev[\s\S]*Install merged dev validation dependencies[\s\S]*npm ci --ignore-scripts/.test(backmergeWorkflow)) {
fail('Back-merge workflow must install locked Node validation dependencies from the merged dev tree before packaging and validation.');
}
if (!/Commit synchronized dev package[\s\S]*git add --all[\s\S]*git commit --no-verify -m "Rebuild dev package after main sync"/.test(backmergeWorkflow)) {
fail('Back-merge workflow must commit the rebuilt dev package before validation and push.');
Expand Down
5 changes: 2 additions & 3 deletions tests/versioning-guard.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ test('validation workflows delegate to the shared ci suite with dev coverage, fa
assert.match(releaseOnMainWorkflow, /bash scripts\/run_ci_suite\.sh --release/);

assert.match(backmergeWorkflow, /Validate merged dev state before push/);
assert.match(backmergeWorkflow, /Install Node validation dependencies[\s\S]*npm ci --ignore-scripts/);
assert.match(backmergeWorkflow, /Sync main into dev[\s\S]*Install merged dev validation dependencies[\s\S]*npm ci --ignore-scripts/);
assert.match(backmergeWorkflow, /FVPLUS_EXPECT_PLUGIN_BRANCH:\s*'dev'/);
assert.match(backmergeWorkflow, /bash scripts\/prepare_backmerge_dev_package\.sh/);
assert.match(backmergeWorkflow, /Commit synchronized dev package[\s\S]*git add --all[\s\S]*git commit --no-verify -m "Rebuild dev package after main sync"/);
Expand Down Expand Up @@ -652,8 +652,7 @@ test('release-on-main workflow auto-publishes validated releases from current pl
test('back-merge workflow validates merged dev state before pushing', () => {
assert.match(backmergeWorkflow, /name:\s*Back-Merge Main To Dev/);
assert.match(backmergeWorkflow, /Setup CI environment/);
assert.match(backmergeWorkflow, /Install Node validation dependencies[\s\S]*npm ci --ignore-scripts/);
assert.match(backmergeWorkflow, /Sync main into dev/);
assert.match(backmergeWorkflow, /Sync main into dev[\s\S]*Install merged dev validation dependencies[\s\S]*npm ci --ignore-scripts/);
assert.match(backmergeWorkflow, /Commit synchronized dev package[\s\S]*git add --all[\s\S]*git commit --no-verify -m "Rebuild dev package after main sync"/);
assert.match(backmergeWorkflow, /Validate merged dev state before push/);
assert.match(backmergeWorkflow, /Push back-merge branch when updated/);
Expand Down