Skip to content

fix(ci): pin --format-version 1 in metadata checks #2617

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
1688mengdie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ci): pin --format-version 1 in metadata checks #2617

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
4 changes: 2 additions & 2 deletions .github/workflows/linux-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
cache-on-failure: ${{ inputs.cache_write && github.event_name != 'pull_request' }}

- name: Verify committed Cargo metadata
run: cargo metadata --locked --no-deps
run: cargo metadata --locked --no-deps --format-version 1

- name: Patch build version
shell: bash
Expand All @@ -143,7 +143,7 @@ jobs:
node scripts/set-build-version.mjs --version "$ASSET_VERSION"

- name: Verify projected Cargo metadata
run: cargo metadata --locked --no-deps
run: cargo metadata --locked --no-deps --format-version 1

- name: Build CLI and Relay Server
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
cache-on-failure: ${{ inputs.cache_write && github.event_name != 'pull_request' }}

- name: Verify committed Cargo metadata
run: cargo metadata --locked --no-deps
run: cargo metadata --locked --no-deps --format-version 1

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
echo "Cargo.toml version: $(grep 'x-release-please-version' Cargo.toml)"

- name: Verify projected Cargo metadata
run: cargo metadata --locked --no-deps
run: cargo metadata --locked --no-deps --format-version 1

- name: Run Windows CLI terminal contracts
if: runner.os == 'Windows'
Expand Down
6 changes: 3 additions & 3 deletions scripts/check-github-config.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ test('nightly validates generated inputs and projected lockfiles before packagin
metadataIndex < buildIndex,
'nightly must verify the projected lockfile before nested locked build hooks run',
);
const expectedMetadata = 'cargo metadata --locked --no-deps';
const expectedMetadata = 'cargo metadata --locked --no-deps --format-version 1';
assert.equal(steps[committedMetadataIndex].run, expectedMetadata);
assert.equal(steps[metadataIndex].run, expectedMetadata);
assert.equal(steps[installerI18nIndex].if, "runner.os == 'Windows'");
Expand Down Expand Up @@ -798,8 +798,8 @@ test('Linux binary packaging uses the shared locked version projection contract'
);
assert.match(steps[patchIndex].run, /node scripts\/set-build-version\.mjs/);
assert.doesNotMatch(steps[patchIndex].run, /sed -i/);
assert.equal(steps[committedIndex].run, 'cargo metadata --locked --no-deps');
assert.equal(steps[projectedIndex].run, 'cargo metadata --locked --no-deps');
assert.equal(steps[committedIndex].run, 'cargo metadata --locked --no-deps --format-version 1');
assert.equal(steps[projectedIndex].run, 'cargo metadata --locked --no-deps --format-version 1');
assert.match(steps[buildIndex].run, /cargo build --locked --release/);
const rustCache = steps.find((step) =>
step.uses?.startsWith('swatinem/rust-cache@'));
Expand Down