Merge branch 'main' into main

open-telemetry · May 9, 2023 · 847d7ac · 847d7ac
2 parents d8c68af + 7971a12
commit 847d7ac
Showing 1 changed file with 16 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,23 +19,17 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-      - name: Module cache
-        uses: actions/cache@v3
-        env:
-          cache-name: go-mod-cache
+      - name: Install Go
+        uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
+          go-version: ${{ env.DEFAULT_GO_VERSION }}
+          cache-dependency-path: "**/go.sum"
       - name: Tools cache
         uses: actions/cache@v3
         env:
@@ -53,46 +47,34 @@ jobs:
   test-race:
     runs-on: ubuntu-latest
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-      - name: Module cache
-        uses: actions/cache@v3
-        env:
-          cache-name: go-mod-cache
+      - name: Install Go
+        uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
+          go-version: ${{ env.DEFAULT_GO_VERSION }}
+          cache-dependency-path: "**/go.sum"
       - name: Run tests with race detector
         run: make test-race
 
   test-coverage:
     runs-on: ubuntu-latest
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-      - name: Module cache
-        uses: actions/cache@v3
-        env:
-          cache-name: go-mod-cache
+      - name: Install Go
+        uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
+          go-version: ${{ env.DEFAULT_GO_VERSION }}
+          cache-dependency-path: "**/go.sum"
       - name: Run coverage tests
         run: |
           make test-coverage
@@ -128,24 +110,18 @@ jobs:
             arch: "386"
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
         shell: bash
-      - name: Module cache
-        uses: actions/cache@v3
-        env:
-          cache-name: go-mod-cache
+      - name: Install Go
+        uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
+          go-version: ${{ matrix.go-version }}
+          cache-dependency-path: "**/go.sum"
       - name: Run tests
         env:
           GOARCH: ${{ matrix.arch }}