Adopt the .go-version approach for toolchain versioning

Signed-off-by: Chun-Hung Tseng <[email protected]> Co-authored-by: Iván Valdés Castillo <[email protected]>
etcd-io · Apr 4, 2024 · 138719c · 138719c
1 parent 980f2a6
commit 138719c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/failpoint_test.yaml b/.github/workflows/failpoint_test.yaml
@@ -9,9 +9,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - id: goversion
+        run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.21.9"
+          go-version: ${{ steps.goversion.outputs.goversion }}
       - run: |
           make gofail-enable
           make test-failpoint

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,9 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.21.9"
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: make fmt
     - env:
         TARGET: ${{ matrix.target }}
@@ -64,9 +66,11 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.21.9"
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: make fmt
     - env:
         TARGET: ${{ matrix.target }}
@@ -92,8 +96,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.21.9"
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: make coverage
 
diff --git a/.go-version b/.go-version
@@ -0,0 +1 @@
+1.22.2
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/bbolt
 
-go 1.21
+go 1.22
 
 require (
 	github.com/stretchr/testify v1.8.1

diff --git a/manydbs_test.go b/manydbs_test.go
@@ -46,9 +46,8 @@ func createAndPutKeys(t *testing.T) {
 			}
 
 			var key [16]byte
-			_, rerr := rand.Read(key[:])
-			if rerr != nil {
-				return rerr
+			if _, err := rand.Read(key[:]); err != nil {
+				return err
 			}
 			if err := nodes.Put(key[:], nil); err != nil {
 				return err