Merge pull request #221 from docker/fix-e2e

Fix e2e tests
docker · Feb 27, 2024 · 688ad00 · 688ad00
2 parents 6911e3c + f33afee
commit 688ad00
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -9,10 +9,10 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.22
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.22
         id: go
 
       - name: Checkout code into the Go module directory
@@ -36,10 +36,10 @@ jobs:
       - name: Docker version
         run: docker version
 
-      - name: Set up Go 1.15
+      - name: Set up Go 1.22
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.22
         id: go
 
       - name: Checkout code into the Go module directory

diff --git a/.github/workflows/release-weekly-build.yml b/.github/workflows/release-weekly-build.yml
@@ -19,10 +19,10 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.22
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.22
         id: go
 
       - name: Checkout code into the Go module directory
@@ -41,10 +41,10 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.22
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.22
         id: go
 
       - name: Checkout code into the Go module directory
@@ -78,10 +78,10 @@ jobs:
       GITHUB_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.22
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.22
         id: go
 
       - name: Checkout code into the Go module directory
@@ -101,7 +101,7 @@ jobs:
         env:
           E2E_HUB_USERNAME: ${{ secrets.E2E_HUB_USERNAME }}
           E2E_HUB_TOKEN: ${{ secrets.E2E_HUB_TOKEN }}
-        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile e2e
+        run: make TAG_NAME=${{ github.event.inputs.tag }} e2e
 
   release:
     name: Do GitHub release