Merge branch 'main' into additioal-batchoverhead

open-telemetry · Jan 4, 2022 · cbfac42 · cbfac42
2 parents e5d7374 + c772d57
commit cbfac42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2.1.4
+        uses: actions/setup-go@v2.1.5
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2.1.4
+        uses: actions/setup-go@v2.1.5
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2.1.4
+        uses: actions/setup-go@v2.1.5
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
       - name: Checkout Repo
@@ -123,7 +123,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2.1.4
+        uses: actions/setup-go@v2.1.5
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: ${{ github.head_ref }}
-    - uses: actions/setup-go@v2.1.4
+    - uses: actions/setup-go@v2.1.5
       with:
         go-version: '^1.16.0'
     - uses: evantorrie/mott-the-tidier@v1-beta