Fix workflows file, pin mac os FIPS crossbuild runner to macos-13
The macos-13 runner uses intel chips and thus x86, so clang 12.0.0 is easily available.
This commit is contained in:
parent
924f452130
commit
b7baacc047
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
name: rustfmt
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Rust
|
||||
run: rustup update stable && rustup default stable
|
||||
- name: Check formatting
|
||||
|
|
@ -27,7 +27,7 @@ jobs:
|
|||
name: clippy
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust
|
||||
|
|
@ -184,7 +184,7 @@ jobs:
|
|||
extra_test_args: --workspace --exclude tokio-boring --exclude hyper-boring
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust (rustup)
|
||||
|
|
@ -238,7 +238,7 @@ jobs:
|
|||
name: Test FIPS integration
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust (rustup)
|
||||
|
|
@ -250,7 +250,6 @@ jobs:
|
|||
version: "12.0.0"
|
||||
directory: ${{ runner.temp }}/llvm
|
||||
- name: Install golang
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version: '>=1.22.0'
|
||||
|
|
@ -280,7 +279,7 @@ jobs:
|
|||
include:
|
||||
- target: x86_64-unknown-linux-gnu
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust (rustup)
|
||||
|
|
@ -298,18 +297,22 @@ jobs:
|
|||
|
||||
cross-build-fips:
|
||||
name: Cross build from macOS to Linux (FIPS)
|
||||
runs-on: macos-latest
|
||||
runs-on: macos-13 # Need an Intel (x86_64) runner for Clang 12.0.0
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- target: x86_64-unknown-linux-gnu
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust (rustup)
|
||||
run: rustup update stable --no-self-update && rustup default stable && rustup target add ${{ matrix.target }}
|
||||
shell: bash
|
||||
- name: Install golang
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version: '>=1.22.0'
|
||||
- name: Install Clang-12
|
||||
uses: KyleMayes/install-llvm-action@v1
|
||||
with:
|
||||
|
|
@ -335,7 +338,7 @@ jobs:
|
|||
name: Test features
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
- name: Install Rust (rustup)
|
||||
|
|
|
|||
Loading…
Reference in New Issue