Skip to content

Commit 6258c56

Browse files
committed
start extracting .tool-versions, remove commented gcloud code
1 parent 379f3f2 commit 6258c56

File tree

7 files changed

+198
-161
lines changed

7 files changed

+198
-161
lines changed

.github/workflows/devbox-cache.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/lint.yaml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,9 @@ jobs:
3939
git add --all
4040
git diff --minimal --cached --exit-code
4141
42-
tools:
43-
name: Get tool-versions
44-
runs-on: ubuntu-latest
45-
steps:
46-
- name: Check out Code
47-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
48-
- name: Parse tool-versions file
49-
uses: smartcontractkit/tool-versions-to-env-action@aabd5efbaf28005284e846c5cf3a02f2cba2f4c2 # v1.0.8
50-
id: tool-versions
51-
outputs:
52-
golangci-lint-version: ${{ steps.tool-versions.outputs.golangci-lint_version }}
5342
golangci:
5443
name: Linting-${{ matrix.project.name }}
5544
runs-on: ubuntu-latest
56-
needs: [tools]
5745
strategy:
5846
fail-fast: false
5947
matrix:
@@ -92,7 +80,7 @@ jobs:
9280
- name: golangci-lint ${{ needs.tools.outputs.golangci-lint-version }}
9381
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
9482
with:
95-
version: v${{ needs.tools.outputs.golangci-lint-version }}
83+
version: 'v1.64.2'
9684
args: --out-format checkstyle:golangci-lint-report.xml
9785
skip-cache: true
9886
working-directory: ${{ matrix.project.path }}
@@ -109,7 +97,6 @@ jobs:
10997
vulnerabilities-check:
11098
name: Check for Vulnerabilities
11199
runs-on: ubuntu-latest
112-
needs: [tools]
113100
steps:
114101
- name: Check out Code
115102
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
@@ -125,15 +112,6 @@ jobs:
125112
- name: Nancy
126113
uses: sonatype-nexus-community/nancy-github-action@726e338312e68ecdd4b4195765f174d3b3ce1533 # v1.0.3
127114

128-
asdf-install:
129-
name: Install ASDF Dependencies
130-
runs-on: ubuntu-latest
131-
steps:
132-
- name: Check out Code
133-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
134-
- name: Install asdf dependencies
135-
uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6 # v3.0.2
136-
137115
helmlint:
138116
name: Lint Helm Charts
139117
runs-on: ubuntu-latest

.github/workflows/update-internal-mirrors.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ jobs:
4646
expression: '^v?[0-9]+\.[0-9]+\.[0-9]+$'
4747
- name: wiremock/wiremock
4848
expression: '^v?[0-9]+\.[0-9]+\.[0-9]+$'
49-
# disabled until gcloud auth is added
50-
# - name: gcr.io/prysmaticlabs/prysm/beacon-chain
51-
# expression: '^v[0-9]+\.[0-9]+\.[0-9]+$'
52-
# - name: gcr.io/prysmaticlabs/prysm/validator
53-
# expression: '^v[0-9]+\.[0-9]+\.[0-9]+$'
5449
- name: tofelb/ethereum-genesis-generator
5550
expression: '.*'
5651
# This one only has latest tag, probably only want to update it when we know for sure it's a new version we want

.tool-versions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ kubectl 1.25.5
1010
yarn 1.22.19
1111
python 3.9.13
1212
pre-commit 3.5.0
13-
gcloud 466.0.0
1413
typos 1.20.3

Makefile

Lines changed: 0 additions & 5 deletions
This file was deleted.

devbox.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.14.0/.schema/devbox.schema.json",
33
"packages": [
4+
"golangci-lint@1.64.2",
45
"solc-select@1.0.4",
5-
"go-ethereum@1.13.4",
6+
"go-ethereum@1.13.5",
67
"foundry@1.0.0",
78
"git@latest",
89
"go@latest",
910
"goreleaser@latest",
1011
"postgresql@15",
11-
"python@latest",
12+
"python@3.9.13",
1213
"curl@latest",
13-
"nodejs@18",
14+
"nodejs@18.20.4",
1415
"pnpm@latest",
15-
"yarn@latest",
16-
"pre-commit@latest",
16+
"yarn@1.22.19",
17+
"pre-commit@3.6.0",
1718
"go-mockery@latest",
1819
"gotools@latest",
1920
"gopls@latest",
@@ -25,8 +26,9 @@
2526
"awscli2@latest",
2627
"devspace@latest",
2728
"kubectl@latest",
28-
"kubernetes-helm@latest",
29-
"k9s@latest"
29+
"kubernetes-helm@3.15.2",
30+
"k9s@latest",
31+
"actionlint@1.6.26"
3032
],
3133
"shell": {
3234
"init_hook": [
@@ -161,4 +163,4 @@
161163
]
162164
}
163165
}
164-
}
166+
}

0 commit comments

Comments
 (0)