update workflows (#13)

Author: AriehSchneier

.github/workflows/generate-tag.yml

@@ -9,17 +9,31 @@ on:
 jobs:
   generate-tag:
     name: Generate tag
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER_UBUNTU && fromJSON(vars.RUNNER_UBUNTU) || 'ubuntu-latest' }}
     steps:
       - name: Check out code
         uses: actions/checkout@master
         with:
           fetch-depth: '0'
 
+      - name: Checkout github-tag-action
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ vars.GENERATE_TAG_REPO || 'anothrNick/github-tag-action' }}
+          ref: ${{ vars.GENERATE_TAG_REF || '1.62.0' }}
+          path: ./.github/action${{ vars.GENERATE_TAG_PATH || '/github-tag-action/' }}
+          token: ${{ vars.GENERATE_TAG_SECRET && secrets[vars.GENERATE_TAG_SECRET] || secrets.GITHUB_TOKEN }}
+
+      # Generate tag if commit message contains #major or #patch or #patch
       - name: Bump version and push tag
         id: generate_tag
-        uses: anz-bank/github-tag-action@1.40.0
+        uses: ./.github/action/github-tag-action
         env:
+          # An action in a workflow run can't trigger a new workflow run.
+          # When you use GITHUB_TOKEN in your actions, all of the interactions
+          # with the repository are on behalf of the Github-actions bot.
+          # The operations act by Github-actions bot cannot trigger a new workflow run.
+          # More details: https://help.github.com/en/actions/reference/events-that-trigger-workflows#about-workflow-events
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
           DEFAULT_BUMP: patch

.github/workflows/go.yml

@@ -5,11 +5,14 @@ on:
       - master
       - pre-generics
   pull_request:
-jobs:
 
+env:
+  GOPROXY: ${{ vars.GOPROXY }}
+
+jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER_UBUNTU && fromJSON(vars.RUNNER_UBUNTU) || 'ubuntu-latest' }}
     steps:
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -21,14 +24,16 @@ jobs:
 
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
-      with:
-        version: v1.48
 
   build:
     name: Build
-    runs-on: ubuntu-latest
-    container: golang:1.19
+    runs-on: ${{ vars.RUNNER_UBUNTU && fromJSON(vars.RUNNER_UBUNTU) || 'ubuntu-latest' }}
     steps:
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
 
@@ -37,9 +42,13 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-latest
-    container: golang:1.19
+    runs-on: ${{ vars.RUNNER_UBUNTU && fromJSON(vars.RUNNER_UBUNTU) || 'ubuntu-latest' }}
     steps:
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
 

.golangci.yml

@@ -39,7 +39,7 @@ linters:
   - gocyclo
   - gofmt
   - goimports
-  - revive
+  # - revive
   - gosec
   - gosimple
   - govet

errors/error.go

@@ -13,6 +13,7 @@ const (
 
 type Error string
 
+//nolint:errcheck // This is assigning to _ as an error type, not ignoring an error return
 var _ error = Error("")
 
 func (p Error) Error() string {

parser/scope.go

@@ -81,7 +81,6 @@ const invalidCutpoint = Cutpointdata(-1)
 
 func (s Scope) ReplaceCutPoint(force bool) (newScope Scope, prev, replacement Cutpointdata) {
 	prev = s.GetCutPoint()
-	replacement = invalidCutpoint
 	if prev.valid() || force {
 		// TODO: What's with the random number?
 		replacement = Cutpointdata(rand.Int31()) //nolint:gosec