Merge pull request #1076 from embano1/workflows

vmware-samples · Jul 9, 2023 · 2fec7c6 · 2fec7c6
2 parents 1e5cd23 + cb0ddcd
commit 2fec7c6
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 49 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [main,master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [main,master]
   schedule:
     - cron: "34 21 * * 5"
 

diff --git a/.github/workflows/gcr-dev-image.yml b/.github/workflows/gcr-dev-image.yml
@@ -29,17 +29,18 @@ jobs:
       PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - id: login_to_gcp
         uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033
         with:

diff --git a/.github/workflows/gcr-prerelease-image.yml b/.github/workflows/gcr-prerelease-image.yml
@@ -24,17 +24,18 @@ jobs:
       PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - id: login_to_gcp
         uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,6 +32,7 @@ jobs:
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
 
       - name: Create CHANGELOG for Release
         env:
@@ -46,7 +47,7 @@ jobs:
       - name: GoReleaser
         uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7
         with:
-          args: release --rm-dist --release-notes RELEASE_CHANGELOG.md
+          args: release --clean --release-notes RELEASE_CHANGELOG.md
           workdir: vmware-event-router
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -111,17 +112,18 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - id: login_to_gcp
         uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033
         with:

diff --git a/.github/workflows/router-build.yml b/.github/workflows/router-build.yml
@@ -29,20 +29,21 @@ jobs:
     timeout-minutes: 20
 
     steps:
+      - name: Check out code
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - name: Check out code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - name: GoReleaser Snapshot
         uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7
         with:
           version: latest
-          args: release --rm-dist --snapshot
+          args: release --clean --snapshot
           workdir: vmware-event-router
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -52,7 +53,7 @@ jobs:
         with:
           name: dist
           path: |
-            vmware-event-router/dist/router_Linux_*.tar.gz
+            vmware-event-router/dist/router_linux_*.tar.gz
             vmware-event-router/dist/checksums.txt
           retention-days: 1
 
@@ -69,18 +70,19 @@ jobs:
       KO_DOCKER_REPO: us.gcr.io/daisy-284300/veba # .../router@sha256:
 
     steps:
+      - name: Check out code
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - name: Check out code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - name: Get short COMMIT and TAG
         run: |
           echo "KO_COMMIT=$(echo -n $GITHUB_SHA | cut -c -8)" >> $GITHUB_ENV

diff --git a/.github/workflows/router-helm.yml b/.github/workflows/router-helm.yml
@@ -23,19 +23,17 @@ jobs:
     timeout-minutes: 15
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: 1.19
+          cache-dependency-path: vmware-event-router/go.sum
 
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
-      - name: Check out code onto GOPATH
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-        with:
-          fetch-depth: 1
-
       - name: Get short COMMIT and TAG (used by ko)
         run: |
           echo "KO_COMMIT=$(echo -n $GITHUB_SHA | cut -c -8)" >> $GITHUB_ENV
@@ -135,19 +133,17 @@ jobs:
     timeout-minutes: 15
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: 1.19
+          cache-dependency-path: vmware-event-router/go.sum
 
       - name: Setup ko
         uses: imjasonh/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
 
-      - name: Check out code onto GOPATH
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-        with:
-          fetch-depth: 1
-
       - name: Get short COMMIT and TAG (used by ko)
         run: |
           echo "KO_COMMIT=$(echo -n $GITHUB_SHA | cut -c -8)" >> $GITHUB_ENV

diff --git a/.github/workflows/router-integration-tests.yml b/.github/workflows/router-integration-tests.yml
@@ -28,15 +28,15 @@ jobs:
     timeout-minutes: 20
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - name: Check out code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - name: Install tparse
         run: go install github.com/mfridman/tparse@latest 
 

diff --git a/.github/workflows/router-lint.yml b/.github/workflows/router-lint.yml
@@ -23,14 +23,15 @@ jobs:
     timeout-minutes: 20
 
     steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache: false # use golangci-lint caching
         id: go
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - name: golangci-lint
         uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299
         with:

diff --git a/.github/workflows/router-unit-tests.yml b/.github/workflows/router-unit-tests.yml
@@ -29,15 +29,16 @@ jobs:
     timeout-minutes: 10
 
     steps:
+      - name: Check out code
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: vmware-event-router/go.sum
         id: go
 
-      - name: Check out code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-
       - name: Install tparse
         run: go install github.com/mfridman/tparse@latest        
 

diff --git a/vmware-event-router/.golangci.yml b/vmware-event-router/.golangci.yml
@@ -1,12 +1,4 @@
 linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
   dupl:
     threshold: 100
   funlen:
@@ -65,7 +57,7 @@ linters:
   enable:
     - bodyclose
 #    - deadcode
-    - depguard
+    # - depguard
     - dogsled
     - dupl
     - errcheck

diff --git a/vmware-event-router/.goreleaser.yaml b/vmware-event-router/.goreleaser.yaml
@@ -20,11 +20,6 @@ archives:
     builds:
       - router
     name_template: "router_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
-    replacements: &replacements
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      amd64: x86_64
     format_overrides:
       - goos: windows
         format: zip