Skip to content

Commit 8429330

Browse files
committed
add goenv changes
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent 81589b4 commit 8429330

File tree

6 files changed

+19
-2
lines changed

6 files changed

+19
-2
lines changed

.github/workflows/prebuild.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- uses: actions/setup-go@v5
2525
with:
2626
go-version: ${{ env.GO_VERSION }}
27+
# - run: cd /root/.goenv/plugins/go-build/../.. && git pull && cd -
28+
# - run: goenv install ${{ env.GO_VERSION }} && goenv global ${{ env.GO_VERSION }}
2729
- run: wget https://github.com/google/flatbuffers/releases/download/v22.9.29/Linux.flatc.binary.g++-10.zip
2830
- run: unzip Linux.flatc.binary.g++-10.zip
2931
- run: ./scripts/install-check-tools.sh
@@ -57,6 +59,9 @@ jobs:
5759
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
5860
steps:
5961
- uses: actions/checkout@v4
62+
- uses: actions/setup-go@v5
63+
with:
64+
go-version: ${{ env.GO_VERSION }}
6065
- uses: golangci/golangci-lint-action@v6
6166
with:
6267
version: v${{ env.GOLANGCI_LINT_VERSION }}
@@ -67,6 +72,7 @@ jobs:
6772
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
6873
steps:
6974
- uses: actions/checkout@v4
75+
- run: pip install yamllint
7076
- run: yamllint .
7177

7278
shellcheck:

.github/workflows/releases.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ jobs:
2828
STATIC_BINARY_NAME: ''
2929
steps:
3030
- uses: actions/checkout@v4
31+
- uses: actions/setup-go@v5
32+
with:
33+
go-version: ${{ env.GO_VERSION }}
34+
# - name: Update go version
35+
# run: |
36+
# cd /root/.goenv/plugins/go-build/../.. && git pull && cd -
37+
# goenv install ${{ env.GO_VERSION }} && goenv global ${{ env.GO_VERSION }}
3138
- name: Export cleaned release tag
3239
run: |
3340
export release_tag=${GITHUB_REF#refs/*/} # Strip down to raw tag name

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ require (
6969
github.com/imdario/mergo v0.3.13 // indirect
7070
github.com/josharian/intern v1.0.0 // indirect
7171
github.com/json-iterator/go v1.1.12 // indirect
72+
github.com/kunalkushwaha/ltag v0.2.5 // indirect
7273
github.com/mailru/easyjson v0.7.6 // indirect
7374
github.com/moby/locker v1.0.1 // indirect
7475
github.com/moby/sys/sequential v0.5.0 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
153153
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
154154
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
155155
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
156+
github.com/kunalkushwaha/ltag v0.2.5 h1:kW2/mVXqIUG5NvkZQCTeGKMDjBJ/BGVEgrdfHyA3fnI=
157+
github.com/kunalkushwaha/ltag v0.2.5/go.mod h1:w1hVMWOh870f+WAv/UIoZAy0bHCbPP4+W6JxNcPUiQA=
156158
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
157159
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
158160
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

scripts/check-dco.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ set -eux -o pipefail
1818

1919
# the very first auto-commit doesn't have a DCO and the first real commit has a slightly different format. Exclude those when doing the check.
2020
# We erreneously allowed a non-signed commit to be pushed to main.
21-
"$(go env GOPATH)"/bin/git-validation -run DCO -range HEAD~20..HEAD
21+
git-validation -run DCO -range HEAD~20..HEAD

scripts/check-ltag.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ set -eux -o pipefail
1919
CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2020
SOCI_SNAPSHOTTER_PROJECT_ROOT="${CUR_DIR}/.."
2121

22+
2223
# check ltag
2324
pushd "${SOCI_SNAPSHOTTER_PROJECT_ROOT}"
24-
"$(go env GOPATH)"/bin/ltag -t "${SOCI_SNAPSHOTTER_PROJECT_ROOT}/.headers" -check -v || (echo "The files listed above are missing a licence header. Please run ./scripts/add-ltag.sh"; exit 1)
25+
ltag -t "${SOCI_SNAPSHOTTER_PROJECT_ROOT}/.headers" -check -v || (echo "The files listed above are missing a licence header. Please run ./scripts/add-ltag.sh"; exit 1)
2526
popd

0 commit comments

Comments
 (0)