Skip to content

Commit 6a8fa62

Browse files
authored
ci: Upgrade devbox install action and remove custom golangci-lint (#1322)
**What problem does this PR solve?**: The latest devbox-install-action removes the need for custom nix installation on self-hosted runners. Also the nixhub.io indexing has been fixed upstream so can remove our custom installation of golangci-lint and use upstream discovered version. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 8fbed66 commit 6a8fa62

File tree

11 files changed

+71
-39
lines changed

11 files changed

+71
-39
lines changed

.github/workflows/blackduck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v5
3232

3333
- name: Install devbox
34-
uses: jetify-com/devbox-install-action@v0.13.0
34+
uses: jetify-com/devbox-install-action@v0.14.0
3535
with:
3636
enable-cache: true
3737

.github/workflows/checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v5
3232

3333
- name: Install devbox
34-
uses: jetify-com/devbox-install-action@v0.13.0
34+
uses: jetify-com/devbox-install-action@v0.14.0
3535
with:
3636
enable-cache: true
3737

@@ -128,7 +128,7 @@ jobs:
128128
uses: actions/checkout@v5
129129

130130
- name: Install devbox
131-
uses: jetify-com/devbox-install-action@v0.13.0
131+
uses: jetify-com/devbox-install-action@v0.14.0
132132
with:
133133
enable-cache: true
134134

@@ -166,7 +166,7 @@ jobs:
166166
ref: ${{ github.event.pull_request.head.sha }}
167167

168168
- name: Install devbox
169-
uses: jetify-com/devbox-install-action@v0.13.0
169+
uses: jetify-com/devbox-install-action@v0.14.0
170170
with:
171171
enable-cache: true
172172

@@ -204,7 +204,7 @@ jobs:
204204
fetch-depth: 0
205205

206206
- name: Install devbox
207-
uses: jetify-com/devbox-install-action@v0.13.0
207+
uses: jetify-com/devbox-install-action@v0.14.0
208208
with:
209209
enable-cache: true
210210

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
languages: ${{ matrix.language }}
3636

3737
- name: Install devbox
38-
uses: jetify-com/devbox-install-action@v0.13.0
38+
uses: jetify-com/devbox-install-action@v0.14.0
3939
with:
4040
enable-cache: true
4141

.github/workflows/devbox-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v5
2828

2929
- name: Install devbox
30-
uses: jetify-com/devbox-install-action@v0.13.0
30+
uses: jetify-com/devbox-install-action@v0.14.0
3131
with:
3232
enable-cache: true
3333

.github/workflows/e2e.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,10 @@ jobs:
3838
uses: actions/checkout@v5
3939
with:
4040
fetch-depth: 0
41-
42-
- name: Install Nix on self-hosted ARC runners
43-
uses: DeterminateSystems/nix-installer-action@v20
44-
if: inputs.runs-on == 'self-hosted-ncn-dind'
45-
with:
46-
github-token: ${{ secrets.GITHUB_TOKEN }}
47-
logger: pretty
48-
extra-conf: experimental-features = ca-derivations fetch-closure
49-
5041
- name: Install devbox
51-
uses: jetify-com/devbox-install-action@v0.13.0
42+
uses: jetify-com/devbox-install-action@v0.14.0
5243
with:
5344
enable-cache: ${{ inputs.runs-on != 'self-hosted-ncn-dind' }}
54-
skip-nix-installation: ${{ inputs.runs-on == 'self-hosted-ncn-dind' }}
5545

5646
- name: Go cache
5747
uses: actions/cache@v4

.github/workflows/github-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v5
4040

4141
- name: Install devbox
42-
uses: jetify-com/devbox-install-action@v0.13.0
42+
uses: jetify-com/devbox-install-action@v0.14.0
4343
with:
4444
enable-cache: true
4545

.github/workflows/govulncheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v5
2929

3030
- name: Install devbox
31-
uses: jetify-com/devbox-install-action@v0.13.0
31+
uses: jetify-com/devbox-install-action@v0.14.0
3232
with:
3333
enable-cache: true
3434

.github/workflows/release-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 0
2929

3030
- name: Install devbox
31-
uses: jetify-com/devbox-install-action@v0.13.0
31+
uses: jetify-com/devbox-install-action@v0.14.0
3232
with:
3333
enable-cache: true
3434

devbox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"gnused": "latest",
1515
"go": "latest",
1616
"gojq": "latest",
17+
"golangci-lint": "latest",
1718
"gomplate": "latest",
1819
"goreleaser": "latest",
1920
"gotestsum": "latest",
@@ -35,7 +36,6 @@
3536
"yamllint": "latest",
3637
"yq-go": "latest",
3738
"path:./hack/flakes#clusterctl-aws": "",
38-
"path:./hack/flakes#golangci-lint": "",
3939
"path:./hack/flakes#goprintconst": "",
4040
"path:./hack/flakes#helm-with-plugins": "",
4141
"path:./hack/flakes#release-please": "",

devbox.lock

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -786,50 +786,50 @@
786786
}
787787
},
788788
"go@latest": {
789-
"last_modified": "2025-07-13T22:45:35Z",
790-
"resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#go",
789+
"last_modified": "2025-09-18T16:33:27Z",
790+
"resolved": "github:NixOS/nixpkgs/f4b140d5b253f5e2a1ff4e5506edbf8267724bde#go",
791791
"source": "devbox-search",
792-
"version": "1.24.4",
792+
"version": "1.25.0",
793793
"systems": {
794794
"aarch64-darwin": {
795795
"outputs": [
796796
{
797797
"name": "out",
798-
"path": "/nix/store/f4a0g1p943l61wfvqnpdr73v9bsyfhf2-go-1.24.4",
798+
"path": "/nix/store/cr196bvbbai01r0w11p1inkzkdrqdx6y-go-1.25.0",
799799
"default": true
800800
}
801801
],
802-
"store_path": "/nix/store/f4a0g1p943l61wfvqnpdr73v9bsyfhf2-go-1.24.4"
802+
"store_path": "/nix/store/cr196bvbbai01r0w11p1inkzkdrqdx6y-go-1.25.0"
803803
},
804804
"aarch64-linux": {
805805
"outputs": [
806806
{
807807
"name": "out",
808-
"path": "/nix/store/mdyik6amglpjs533vk927f9w1qmyw239-go-1.24.4",
808+
"path": "/nix/store/yhcdwwikp86p2cpq0qr7di91ji63460s-go-1.25.0",
809809
"default": true
810810
}
811811
],
812-
"store_path": "/nix/store/mdyik6amglpjs533vk927f9w1qmyw239-go-1.24.4"
812+
"store_path": "/nix/store/yhcdwwikp86p2cpq0qr7di91ji63460s-go-1.25.0"
813813
},
814814
"x86_64-darwin": {
815815
"outputs": [
816816
{
817817
"name": "out",
818-
"path": "/nix/store/b56ngr9p7x6z368w8m7ps95r3x8gdfv7-go-1.24.4",
818+
"path": "/nix/store/hz7dfw13v8iff4vf6vbnqnlnd7wh7j5x-go-1.25.0",
819819
"default": true
820820
}
821821
],
822-
"store_path": "/nix/store/b56ngr9p7x6z368w8m7ps95r3x8gdfv7-go-1.24.4"
822+
"store_path": "/nix/store/hz7dfw13v8iff4vf6vbnqnlnd7wh7j5x-go-1.25.0"
823823
},
824824
"x86_64-linux": {
825825
"outputs": [
826826
{
827827
"name": "out",
828-
"path": "/nix/store/xrzqlk92h7z5mz9mlc4a9dyy91n5b68i-go-1.24.4",
828+
"path": "/nix/store/3fd683jfggglpshxprz9mi5sz8wd3c9p-go-1.25.0",
829829
"default": true
830830
}
831831
],
832-
"store_path": "/nix/store/xrzqlk92h7z5mz9mlc4a9dyy91n5b68i-go-1.24.4"
832+
"store_path": "/nix/store/3fd683jfggglpshxprz9mi5sz8wd3c9p-go-1.25.0"
833833
}
834834
}
835835
},
@@ -881,6 +881,54 @@
881881
}
882882
}
883883
},
884+
"golangci-lint@latest": {
885+
"last_modified": "2025-09-18T16:33:27Z",
886+
"resolved": "github:NixOS/nixpkgs/f4b140d5b253f5e2a1ff4e5506edbf8267724bde#golangci-lint",
887+
"source": "devbox-search",
888+
"version": "2.4.0",
889+
"systems": {
890+
"aarch64-darwin": {
891+
"outputs": [
892+
{
893+
"name": "out",
894+
"path": "/nix/store/2iiw320mwgw7flh47zbz6l62fakrb3dx-golangci-lint-2.4.0",
895+
"default": true
896+
}
897+
],
898+
"store_path": "/nix/store/2iiw320mwgw7flh47zbz6l62fakrb3dx-golangci-lint-2.4.0"
899+
},
900+
"aarch64-linux": {
901+
"outputs": [
902+
{
903+
"name": "out",
904+
"path": "/nix/store/hwr3wdhqnlcay07xpgv2wm1mx7k5nkhf-golangci-lint-2.4.0",
905+
"default": true
906+
}
907+
],
908+
"store_path": "/nix/store/hwr3wdhqnlcay07xpgv2wm1mx7k5nkhf-golangci-lint-2.4.0"
909+
},
910+
"x86_64-darwin": {
911+
"outputs": [
912+
{
913+
"name": "out",
914+
"path": "/nix/store/skcc363l41rm6hjyrhzlfbk3rrwci2lb-golangci-lint-2.4.0",
915+
"default": true
916+
}
917+
],
918+
"store_path": "/nix/store/skcc363l41rm6hjyrhzlfbk3rrwci2lb-golangci-lint-2.4.0"
919+
},
920+
"x86_64-linux": {
921+
"outputs": [
922+
{
923+
"name": "out",
924+
"path": "/nix/store/dlz6z4dih7rd6q9dnigvz49npfmv8m52-golangci-lint-2.4.0",
925+
"default": true
926+
}
927+
],
928+
"store_path": "/nix/store/dlz6z4dih7rd6q9dnigvz49npfmv8m52-golangci-lint-2.4.0"
929+
}
930+
}
931+
},
884932
"gomplate@latest": {
885933
"last_modified": "2025-07-13T22:45:35Z",
886934
"resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#gomplate",

0 commit comments

Comments
 (0)