Use the go version from go.mod by default

...but still allow specifying the version explicitly. I'd annoyingly picked the explicit-go-version path only, but that makes it difficult to deal with version bumps.
boinkor-net · Aug 22, 2023 · 4f8b6f5 · 4f8b6f5
1 parent 3ab3fac
commit 4f8b6f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci_baseline_go_build.yml b/.github/workflows/ci_baseline_go_build.yml
@@ -7,9 +7,8 @@ on:
         type: string
         default: "."
       go_version:
-        description: "Go toolchain to use"
+        description: "Go toolchain to use. If unspecified, will use the version given in go.mod in module_base."
         type: string
-        default: "1.20"
       subdir:
         description: "Directory containing the main.go of the executable being built"
         type: string
@@ -36,6 +35,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{inputs.go_version}}
+          go-version-file: ${{inputs.module_base}}/go.mod
       - run: go build -v ./${{inputs.subdir}}
         id: build
         working-directory: ${{inputs.module_base}}
diff --git a/.github/workflows/ci_baseline_go_lints.yml b/.github/workflows/ci_baseline_go_lints.yml
@@ -7,9 +7,8 @@ on:
         type: string
         default: "."
       go_version:
-        description: "Go toolchain to use"
+        description: "Go toolchain to use. If unspecified, will use the version given in go.mod in module_base."
         type: string
-        default: "1.20"
 
       # Used for testing this repo:
       _internal_continue_on_error:
@@ -32,6 +31,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{inputs.go_version}}
+          go-version-file: ${{inputs.module_base}}/go.mod
       - name: golangci-lint
         id: lint
         uses: golangci/golangci-lint-action@v3

diff --git a/.github/workflows/ci_baseline_go_tests.yml b/.github/workflows/ci_baseline_go_tests.yml
@@ -7,9 +7,8 @@ on:
         type: string
         default: "."
       go_version:
-        description: "Go toolchain to use"
+        description: "Go toolchain to use. If unspecified, will use the version given in go.mod in module_base."
         type: string
-        default: "1.20"
 
       # Used for testing this repo:
       _internal_continue_on_error:
@@ -32,6 +31,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{inputs.go_version}}
+          go-version-file: ${{inputs.module_base}}/go.mod
       - run: go test -v ./...
         id: test
         working-directory: ${{inputs.module_base}}