Skip to content

Commit 46bd97c

Browse files
authored
Modernize actions & pre-commit & nixpkgs (#71)
* update: action versions and default nixpkgs * update: cache so it doesn't hang * update: pre-commit hooks * update: nixpkgs version referenced in flake
1 parent 8ed6825 commit 46bd97c

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
env:
99
PRE_COMMIT_HOME: .pre-commit-cache
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Allow workspace
1313
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
1414
- name: Cache .pre-commit-cache
15-
uses: actions/cache@v3
15+
uses: actions/cache@v4
1616
with:
1717
path: |
1818
.pre-commit-cache
@@ -24,10 +24,10 @@ jobs:
2424
- pre-commit
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
28-
- uses: cachix/install-nix-action@v20
27+
- uses: actions/checkout@v4
28+
- uses: cachix/install-nix-action@v27
2929
with:
30-
nix_path: channel:nixos-22.11
30+
nix_path: nixpkgs=channel:nixos-24.05
3131
# Note that cachix-action isn't used here. It adds a couple seconds to
3232
# CI time, so if nothing is cachable, just save those seconds. You'd
3333
# waste a minute of CI time for every 15 runs.

.github/workflows/release.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
dot_love:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: cachix/install-nix-action@v20
19+
- uses: actions/checkout@v4
20+
- uses: cachix/install-nix-action@v27
2121
with:
22-
nix_path: channel:nixos-22.11
23-
- uses: cachix/cachix-action@v12
22+
nix_path: nixpkgs=channel:nixos-24.05
23+
- uses: cachix/cachix-action@v15
2424
with:
2525
name: bismuthsoft
2626
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
@@ -30,7 +30,7 @@ jobs:
3030
"$(nix eval --raw .#super_rogue.dot_love)/super_rogue.love" \
3131
>> "$GITHUB_OUTPUT"
3232
id: dot_love
33-
- uses: actions/upload-artifact@v3
33+
- uses: actions/upload-artifact@v4
3434
with:
3535
name: dot_love-${{ github.sha }}
3636
path: ${{ steps.dot_love.outputs.DOT_LOVE }}
@@ -40,11 +40,11 @@ jobs:
4040
- dot_love # Use pre-built game.love via cachix
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v3
44-
- uses: cachix/install-nix-action@v20
43+
- uses: actions/checkout@v4
44+
- uses: cachix/install-nix-action@v27
4545
with:
46-
nix_path: channel:nixos-22.11
47-
- uses: cachix/cachix-action@v12
46+
nix_path: nixpkgs=channel:nixos-24.05
47+
- uses: cachix/cachix-action@v15
4848
with:
4949
name: bismuthsoft
5050
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
@@ -65,8 +65,8 @@ jobs:
6565
- dot_love
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@v3
69-
- uses: actions/download-artifact@v3
68+
- uses: actions/checkout@v4
69+
- uses: actions/download-artifact@v4
7070
with:
7171
name: dot_love-${{ github.sha }}
7272
- name: Build Linux packages
@@ -95,8 +95,8 @@ jobs:
9595
- dot_love
9696
runs-on: macos-latest
9797
steps:
98-
- uses: actions/checkout@v3
99-
- uses: actions/download-artifact@v3
98+
- uses: actions/checkout@v4
99+
- uses: actions/download-artifact@v4
100100
with:
101101
name: dot_love-${{ github.sha }}
102102
- name: Build macOS packages
@@ -122,7 +122,7 @@ jobs:
122122
dmg-volume-name: "super_rogue"
123123
dmg-window-position: "200 120"
124124
dmg-window-size: "1024 604"
125-
- uses: actions/upload-artifact@v3
125+
- uses: actions/upload-artifact@v4
126126
with:
127127
name: dist-mac
128128
path: dist
@@ -131,8 +131,8 @@ jobs:
131131
- dot_love
132132
runs-on: windows-latest
133133
steps:
134-
- uses: actions/checkout@v3
135-
- uses: actions/download-artifact@v3
134+
- uses: actions/checkout@v4
135+
- uses: actions/download-artifact@v4
136136
with:
137137
name: dot_love-${{ github.sha }}
138138
- name: Build Windows packages
@@ -159,20 +159,20 @@ jobs:
159159
- dot_love
160160
runs-on: ubuntu-latest
161161
steps:
162-
- uses: actions/download-artifact@v3
162+
- uses: actions/download-artifact@v4
163163
with:
164164
name: dot_love-${{ github.sha }}
165-
- uses: actions/download-artifact@v3
165+
- uses: actions/download-artifact@v4
166166
with:
167167
name: dist-windows
168-
- uses: actions/download-artifact@v3
168+
- uses: actions/download-artifact@v4
169169
with:
170170
name: dist-linux
171171
- run: |
172172
mv super_rogue_x86.zip super_rogue_windows_x86.zip
173173
mv super_rogue_x64.zip super_rogue_windows_x64.zip
174174
- name: Release
175-
uses: softprops/action-gh-release@v1
175+
uses: softprops/action-gh-release@v2
176176
# if: startsWith(github.ref, 'refs/tags/')
177177
with:
178178
files: |

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.3.0
3+
rev: v4.6.0
44
hooks:
55
- id: check-yaml
66
- id: check-toml

flake.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
description = "A very basic flake";
33

4-
inputs.nixpkgs.url = "nixpkgs/nixos-23.05";
4+
inputs.nixpkgs.url = "nixpkgs/nixos-24.05";
55

66
outputs = { self, nixpkgs }: let
77
pkgs = nixpkgs.legacyPackages.x86_64-linux.buildPackages;

0 commit comments

Comments
 (0)