Skip to content

Commit c6e77ab

Browse files
jimmidysonjimmidyson
authored
build: Update all tools via devbox update (#1328)
**What problem does this PR solve?**: nixhub.io indexing was recently fixed and so we can update all tools again. **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 82a4976 commit c6e77ab

21 files changed

+671
-664
lines changed

‎.github/workflows/blackduck.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,20 @@ jobs:
3535
with:
3636
enable-cache: true
3737

38+
- name: Export go version and mod cache path
39+
id: export-go-version-and-mod-cache-path
40+
run: |
41+
echo go-version="$(devbox run -- go version | cut -d ' ' -f 3)" >>"${GITHUB_OUTPUT}"
42+
echo mod-cache-path="$(devbox run -- go env GOMODCACHE)" >>"${GITHUB_OUTPUT}"
43+
3844
- name: Go cache
3945
uses: actions/cache@v4
4046
with:
4147
path: |
42-
~/.cache/go-build
43-
~/go/pkg/mod
44-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
48+
${{ steps.export-go-version-and-mod-cache-path.outputs.mod-cache-path }}
49+
key: ${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
4550
restore-keys: |
46-
${{ runner.os }}-go-
51+
${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-
4752
4853
- name: Build Project
4954
run: devbox run -- make build-snapshot

‎.github/workflows/checks.yml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,20 @@ jobs:
3535
with:
3636
enable-cache: true
3737

38+
- name: Export go version and mod cache path
39+
id: export-go-version-and-mod-cache-path
40+
run: |
41+
echo go-version="$(devbox run -- go version | cut -d ' ' -f 3)" >>"${GITHUB_OUTPUT}"
42+
echo mod-cache-path="$(devbox run -- go env GOMODCACHE)" >>"${GITHUB_OUTPUT}"
43+
3844
- name: Go cache
3945
uses: actions/cache@v4
4046
with:
4147
path: |
42-
~/.cache/go-build
43-
~/go/pkg/mod
44-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
48+
${{ steps.export-go-version-and-mod-cache-path.outputs.mod-cache-path }}
49+
key: ${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
4550
restore-keys: |
46-
${{ runner.os }}-go-
51+
${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-
4752
4853
- name: Run unit tests
4954
run: devbox run -- make test
@@ -170,15 +175,20 @@ jobs:
170175
with:
171176
enable-cache: true
172177

178+
- name: Export go version and mod cache path
179+
id: export-go-version-and-mod-cache-path
180+
run: |
181+
echo go-version="$(devbox run -- go version | cut -d ' ' -f 3)" >>"${GITHUB_OUTPUT}"
182+
echo mod-cache-path="$(devbox run -- go env GOMODCACHE)" >>"${GITHUB_OUTPUT}"
183+
173184
- name: Go cache
174185
uses: actions/cache@v4
175186
with:
176187
path: |
177-
~/.cache/go-build
178-
~/go/pkg/mod
179-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
188+
${{ steps.export-go-version-and-mod-cache-path.outputs.mod-cache-path }}
189+
key: ${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
180190
restore-keys: |
181-
${{ runner.os }}-go-
191+
${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-
182192
183193
- name: Set up pre-commit cache
184194
uses: actions/cache@v4

‎.github/workflows/e2e.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,20 @@ jobs:
4343
with:
4444
enable-cache: ${{ inputs.runs-on != 'self-hosted-ncn-dind' }}
4545

46+
- name: Export go version and mod cache path
47+
id: export-go-version-and-mod-cache-path
48+
run: |
49+
echo go-version="$(devbox run -- go version | cut -d ' ' -f 3)" >>"${GITHUB_OUTPUT}"
50+
echo mod-cache-path="$(devbox run -- go env GOMODCACHE)" >>"${GITHUB_OUTPUT}"
51+
4652
- name: Go cache
4753
uses: actions/cache@v4
4854
with:
4955
path: |
50-
~/.cache/go-build
51-
~/go/pkg/mod
52-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
56+
${{ steps.export-go-version-and-mod-cache-path.outputs.mod-cache-path }}
57+
key: ${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
5358
restore-keys: |
54-
${{ runner.os }}-go-
59+
${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-
5560
5661
# The default disk size of Github hosted runners is ~14GB, this is not enough to run the e2e tests.
5762
# Cleanup the disk, see upstream discussion https://github.com/actions/runner-images/issues/2840.

‎.github/workflows/release-tag.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,20 @@ jobs:
3232
with:
3333
enable-cache: true
3434

35+
- name: Export go version and mod cache path
36+
id: export-go-version-and-mod-cache-path
37+
run: |
38+
echo go-version="$(devbox run -- go version | cut -d ' ' -f 3)" >>"${GITHUB_OUTPUT}"
39+
echo mod-cache-path="$(devbox run -- go env GOMODCACHE)" >>"${GITHUB_OUTPUT}"
40+
3541
- name: Go cache
3642
uses: actions/cache@v4
3743
with:
3844
path: |
39-
~/.cache/go-build
40-
~/go/pkg/mod
41-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
45+
${{ steps.export-go-version-and-mod-cache-path.outputs.mod-cache-path }}
46+
key: ${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
4247
restore-keys: |
43-
${{ runner.os }}-go-
48+
${{ runner.os }}-${{ steps.export-go-version-and-mod-cache-path.outputs.go-version }}-
4449
4550
- name: Login to GitHub Container Registry
4651
uses: docker/login-action@v3

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ repos:
6969
files: "^devbox.(yaml|lock)$"
7070
pass_filenames: false
7171
- repo: https://github.com/tekwizely/pre-commit-golang
72-
rev: v1.0.0-rc.1
72+
rev: v1.0.0-rc.2
7373
hooks:
7474
- id: go-mod-tidy
7575
exclude: ^docs/
7676
- repo: https://github.com/pre-commit/pre-commit-hooks
77-
rev: v5.0.0
77+
rev: v6.0.0
7878
hooks:
7979
- id: trailing-whitespace
8080
stages: [pre-commit]
@@ -123,7 +123,7 @@ repos:
123123
stages: [pre-commit]
124124
exclude: ^\.envrc$
125125
- repo: https://github.com/shellcheck-py/shellcheck-py
126-
rev: v0.10.0.1
126+
rev: v0.11.0.1
127127
hooks:
128128
- id: shellcheck
129129
stages: [pre-commit]

‎api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.18.0
8+
controller-gen.kubebuilder.io/version: v0.19.0
99
name: awsclusterconfigs.caren.nutanix.com
1010
spec:
1111
group: caren.nutanix.com

‎api/v1alpha1/crds/caren.nutanix.com_awsworkernodeconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.18.0
8+
controller-gen.kubebuilder.io/version: v0.19.0
99
name: awsworkernodeconfigs.caren.nutanix.com
1010
spec:
1111
group: caren.nutanix.com

‎api/v1alpha1/crds/caren.nutanix.com_dockerclusterconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.18.0
8+
controller-gen.kubebuilder.io/version: v0.19.0
99
name: dockerclusterconfigs.caren.nutanix.com
1010
spec:
1111
group: caren.nutanix.com

‎api/v1alpha1/crds/caren.nutanix.com_dockerworkernodeconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.18.0
8+
controller-gen.kubebuilder.io/version: v0.19.0
99
name: dockerworkernodeconfigs.caren.nutanix.com
1010
spec:
1111
group: caren.nutanix.com

‎api/v1alpha1/crds/caren.nutanix.com_eksclusterconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.18.0
8+
controller-gen.kubebuilder.io/version: v0.19.0
99
name: eksclusterconfigs.caren.nutanix.com
1010
spec:
1111
group: caren.nutanix.com

0 commit comments

Comments
 (0)