diff options
| author | Oriol Brufau <obrufau@igalia.com> | 2024-03-21 12:54:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 11:54:02 +0000 |
| commit | ea62a5e24f5c9a3b7c0588506f7a38de9ddbcd67 (patch) | |
| tree | e1f68d5697e772047ef3d09f48e42010b61e51e1 /.github | |
| parent | ecabdc2583f8e82f39600c2b5d1ca81a7219f235 (diff) | |
| download | servo-ea62a5e24f5c9a3b7c0588506f7a38de9ddbcd67.tar.gz servo-ea62a5e24f5c9a3b7c0588506f7a38de9ddbcd67.zip | |
Use --locked when building in CI (#31720)
Thus the build will immediately fail if a PR modifies Cargo.toml but
forgets to include the changes in Cargo.lock
This was previously checked by lockfile_changed.sh after building
normally, wasting resources.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/mac.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0a62eff83fa..54517e7d29a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -69,7 +69,7 @@ jobs: env: ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }} run: | - python3 ./mach build --android --target ${{ matrix.arch }} --${{ inputs.profile }} + python3 ./mach build --locked --android --target ${{ matrix.arch }} --${{ inputs.profile }} cp -r target/cargo-timings target/cargo-timings-android-${{ matrix.arch }} # TODO: This is disabled since APK crashes during startup. # See https://github.com/servo/servo/issues/31134 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 158ddee053b..75b9dbd712a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -105,7 +105,7 @@ jobs: run: python3 ./mach test-tidy --no-progress --all - name: Build (${{ inputs.profile }}) run: | - python3 ./mach build --${{ inputs.profile }} + python3 ./mach build --locked --${{ inputs.profile }} cp -r target/cargo-timings target/cargo-timings-linux - name: Smoketest run: xvfb-run python3 ./mach smoketest --${{ inputs.profile }} @@ -124,8 +124,6 @@ jobs: name: cargo-timings-linux # Using a wildcard here ensures that the archive includes the path. path: target/cargo-timings-* - - name: Lockfile check - run: ./etc/ci/lockfile_changed.sh - name: Build mach package run: python3 ./mach package --${{ inputs.profile }} - name: Upload artifact for mach package diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index c48dab55873..93e99634437 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -90,7 +90,7 @@ jobs: brew install gnu-tar - name: Build (${{ inputs.profile }}) run: | - python3 ./mach build --${{ inputs.profile }} + python3 ./mach build --locked --${{ inputs.profile }} cp -r target/cargo-timings target/cargo-timings-macos - name: Smoketest uses: nick-fields/retry@v3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4d203980f27..9bd9beca5e4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -85,7 +85,7 @@ jobs: "$env:WIX\bin" >> $env:GITHUB_PATH - name: Build (${{ inputs.profile }}) run: | - python mach build --${{ inputs.profile }} + python mach build --locked --${{ inputs.profile }} cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse - name: Copy resources run: cp D:\a\servo\servo\resources C:\a\servo\servo -Recurse |