Skip to content

Commit 7cfc422

Browse files
Merge pull request #355 from jonathanmorley/update-nix
2 parents c594a3a + 9a6e7cd commit 7cfc422

File tree

13 files changed

+1115
-1056
lines changed

13 files changed

+1115
-1056
lines changed

.github/workflows/pull.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ jobs:
3939
steps:
4040
- name: Checkout
4141
uses: actions/checkout@v4
42-
- uses: DeterminateSystems/nix-installer-action@v16
43-
- uses: DeterminateSystems/magic-nix-cache-action@v8
42+
- uses: DeterminateSystems/nix-installer-action@v17
4443
- name: Format
4544
run: nix fmt -- --check .
4645
- name: Build

.github/workflows/release.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ on:
4949
jobs:
5050
# Run 'dist plan' (or host) to determine what tasks we need to do
5151
plan:
52-
runs-on: "ubuntu-20.04"
52+
runs-on: "ubuntu-latest"
5353
outputs:
5454
val: ${{ steps.plan.outputs.manifest }}
5555
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -120,13 +120,8 @@ jobs:
120120
- uses: actions/checkout@v4
121121
with:
122122
submodules: recursive
123-
- name: Install Rust non-interactively if not already installed
124-
if: ${{ matrix.container }}
125-
run: |
126-
if ! command -v cargo > /dev/null 2>&1; then
127-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
128-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
129-
fi
123+
- name: Install Rust
124+
uses: actions-rust-lang/setup-rust-toolchain@v1
130125
- uses: swatinem/rust-cache@v2
131126
with:
132127
key: ${{ join(matrix.targets, '-') }}
@@ -181,7 +176,7 @@ jobs:
181176
needs:
182177
- plan
183178
- build-local-artifacts
184-
runs-on: "ubuntu-20.04"
179+
runs-on: "ubuntu-latest"
185180
env:
186181
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
187182
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -231,7 +226,7 @@ jobs:
231226
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
232227
env:
233228
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
234-
runs-on: "ubuntu-20.04"
229+
runs-on: "ubuntu-latest"
235230
outputs:
236231
val: ${{ steps.host.outputs.manifest }}
237232
steps:
@@ -295,7 +290,7 @@ jobs:
295290
# still allowing individual publish jobs to skip themselves (for prereleases).
296291
# "host" however must run to completion, no skipping allowed!
297292
if: ${{ always() && needs.host.result == 'success' }}
298-
runs-on: "ubuntu-20.04"
293+
runs-on: "ubuntu-latest"
299294
env:
300295
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
301296
steps:

0 commit comments

Comments
 (0)