Skip to content

Commit

Permalink
Use ubuntu-22.04-arm; clean up temporary changes
Browse files Browse the repository at this point in the history
In the AArch64/ARM64 (64-bit, non-containerized) test-fast job,
this uses the `ubuntu-22.04-arm` runner instead of the
`ubuntu-24.04-arm` runner. This is to avoid the errors described
in #1790, i.e., to work around rust-lang/rust#135867.

Such problems have not been observed on the 22.04 runner, including
in tests intended to find them, and switching to it seems to be a
complete workaround for the problem. In contrast, continuing to use
the 24.04 runner, but attempting to work around the problem by
switching from the stable to the beta channel, looks like it would
greatly decrease the frequency of the errors but not eliminate
them. A problem with `actions/checkout` failing is likewise
observed on the 24.04 runner only, so using 22.04 avoids that too.

Because that seems like a complete workaround, this also reverts
50da7cb (#1792). That is to say that the ARM64 test-fast job is
again in the `test-fast` matrix. It is capable of cancelling or
being cancelled by the other `test-fast` checks. Code duplication
in the workflow is somewhat decreased. The job will again block PR
auto-merge.

Similar errors do not seem to have occurred in the `test-32bit`
job that runs an arm32v7 Docker image in `ubuntu-24.04-arm`, and it
is not clear that changing the runner image would help with #1780,
nor even if that issue is still happening. Therefore, it is not
changed there at this time.

This affects only ARM Linux runners. The x86-64 runners continue to
use `ubuntu-latest`, which is currently resolved to `ubuntu-24.04`,
and that does not need to be changed. Likewise, the `macos-latest`
runners use ARM processors (Apple Silicon) and they are fine.

Various experiments were done in a separate workflow. This commit
also removes that workflow, because it is not actively needed
anymore, and because, if kept, it would have to be modified to
avoid running hundreds of extra checks on each and every push.
  • Loading branch information
EliahKagan committed Jan 24, 2025
1 parent a0e923b commit 4062b56
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 70 deletions.
50 changes: 0 additions & 50 deletions .github/workflows/arm-segv-experiment.yml

This file was deleted.

21 changes: 1 addition & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ jobs:
- windows-latest
- macos-latest
- ubuntu-latest
- ubuntu-22.04-arm

runs-on: ${{ matrix.os }}

Expand All @@ -160,25 +161,6 @@ jobs:
- name: Check that tracked archives are up to date
run: git diff --exit-code # If this fails, the fix is usually to commit a regenerated archive.

test-fast-arm:
runs-on: ubuntu-24.04-arm

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@v2
with:
tool: nextest
- name: Test (nextest)
env:
GIX_TEST_CREATE_ARCHIVES_EVEN_ON_CI: '1'
run: cargo nextest run --workspace --no-fail-fast
- name: Doctest
run: cargo test --workspace --doc --no-fail-fast
- name: Check that tracked archives are up to date
run: git diff --exit-code # If this fails, the fix is usually to commit a regenerated archive.

test-fixtures-windows:
runs-on: windows-latest

Expand Down Expand Up @@ -405,7 +387,6 @@ jobs:
env:
# List all jobs that are intended NOT to block PR auto-merge here.
EXPECTED_NONBLOCKING_JOBS: |-
test-fast-arm
cargo-deny-advisories
wasm
tests-pass
Expand Down

0 comments on commit 4062b56

Please sign in to comment.