Pass Go/Python version as an explicit input

arcalot · Apr 10, 2024 · 7bb8ae2 · 7bb8ae2
1 parent 429f11e
commit 7bb8ae2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/go_lint_and_test.yaml b/.github/workflows/go_lint_and_test.yaml
@@ -3,8 +3,10 @@
 # a coverage report.  (It is only run when invoked by another workflow.)
 on:
   workflow_call:
-env:
-  go_version: ${{ vars.ARCALOT_GO_VERSION }}
+    inputs:
+      go_version:
+        required: true
+        type: string
 jobs:
   golangci-lint:
     name: golangci-lint
@@ -15,7 +17,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.go_version }}
+          go-version: ${{ inputs.go_version }}
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
@@ -30,7 +32,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.go_version }}
+          go-version: ${{ inputs.go_version }}
       - name: Set up gotestfmt
         uses: GoTestTools/gotestfmt-action@v2
       - uses: actions/cache@v4

diff --git a/.github/workflows/go_release.yaml b/.github/workflows/go_release.yaml
@@ -12,8 +12,9 @@ on:
       for_release:
         required: true
         type: boolean
-env:
-  go_version: ${{ vars.ARCALOT_GO_VERSION }}
+      go_version:
+        required: true
+        type: string
 jobs:
   build:
     name: build ${{ inputs.for_release && 'release' || 'snapshot' }}
@@ -26,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.go_version }}
+          go-version: ${{ inputs.go_version }}
       - name: Build ${{ inputs.for_release && 'release' || 'snapshot' }}
         uses: goreleaser/goreleaser-action@v5
         env:

diff --git a/.github/workflows/python_release.yaml b/.github/workflows/python_release.yaml
@@ -4,11 +4,13 @@
 # (It is only run when invoked by another workflow.)
 on:
   workflow_call:
+    inputs:
+      python_version:
+        required: true
+        type: string
     secrets:
       PYPI_TOKEN:
         required: true
-env:
-  python_version: ${{ vars.ARCALOT_PYTHON_VERSION }}
 jobs:
   build_python_wheel:
     name: build python wheel
@@ -34,7 +36,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ env.python_version }}
+          python-version: ${{ inputs.python_version }}
           architecture: 'x64'
       - name: Grab the License file
         run: |