From a1f99abf084b9f54ef4cb9be2873cd12c859f316 Mon Sep 17 00:00:00 2001
From: Michel Loiseleur <michel.loiseleur@traefik.io>
Date: Mon, 31 Jul 2023 17:54:50 +0200
Subject: [PATCH 1/5] chore(ci): use go 1.20 on all gh workflow

---
 .github/workflows/staging-image-tester.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/staging-image-tester.yml b/.github/workflows/staging-image-tester.yml
index 30c5eda9f..79d2da579 100644
--- a/.github/workflows/staging-image-tester.yml
+++ b/.github/workflows/staging-image-tester.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v4
       with:
-        go-version: 1.19
+        go-version: '1.20'
       id: go
 
     - name: Check out code into the Go module directory

From d6a6325d3d6a51a07e4849380ec85b9c9fc1380e Mon Sep 17 00:00:00 2001
From: Michel Loiseleur <michel.loiseleur@traefik.io>
Date: Tue, 1 Aug 2023 09:27:23 +0200
Subject: [PATCH 2/5] fix: try to reduce disk usage on CI

---
 .github/workflows/staging-image-tester.yml | 19 +++++++++++++++++--
 Makefile                                   |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/staging-image-tester.yml b/.github/workflows/staging-image-tester.yml
index 79d2da579..9cda18f5d 100644
--- a/.github/workflows/staging-image-tester.yml
+++ b/.github/workflows/staging-image-tester.yml
@@ -33,5 +33,20 @@ jobs:
       run: |
         go get -v -t -d ./...
 
-    - name: Test
-      run: make build.image/multiarch
+    - name: Test build on amd64
+      run: make build.image-amd64
+
+    - name: Clean
+      run: make clean
+
+    - name: Test build on arm64
+      run: make build.image-arm64
+
+    - name: Clean
+      run: make clean
+
+    - name: Test build on armv7
+      run: make build.image-arm/v7
+
+    - name: Clean
+      run: make clean
diff --git a/Makefile b/Makefile
index f077f317d..fbf375066 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ build.mini:
 
 clean:
 	@rm -rf build
+	@go clean -cache
 
  # Builds and push container images to the staging bucket.
 .PHONY: release.staging

From 5487db9a0c79ebe10929d25e5e991df55651094d Mon Sep 17 00:00:00 2001
From: Michel Loiseleur <michel.loiseleur@traefik.io>
Date: Tue, 1 Aug 2023 09:53:07 +0200
Subject: [PATCH 3/5] fix: pull-external-dns-lint by downloading golangci-lint
 within Makefile

---
 .github/workflows/lint.yaml | 1 -
 Makefile                    | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index b5dd02509..b4914ea36 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -31,5 +31,4 @@ jobs:
 
     - name: Lint
       run: |
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
         make lint
diff --git a/Makefile b/Makefile
index fbf375066..7d04367c8 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,11 @@ endif
 
 .PHONY: go-lint
 
+golangci-lint:
+	@test -s $(go env GOPATH)/bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+
 # Run the golangci-lint tool
-go-lint:
+go-lint: golangci-lint
 	golangci-lint run --timeout=15m ./...
 
 .PHONY: licensecheck

From 77ec93377b4f727077f84419fcffc3f2c098645c Mon Sep 17 00:00:00 2001
From: Michel Loiseleur <michel.loiseleur@traefik.io>
Date: Tue, 1 Aug 2023 09:54:41 +0200
Subject: [PATCH 4/5] fix the other lint job

---
 .github/workflows/lint.yaml | 1 +
 Makefile                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index b4914ea36..b5dd02509 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -31,4 +31,5 @@ jobs:
 
     - name: Lint
       run: |
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
         make lint
diff --git a/Makefile b/Makefile
index 7d04367c8..e32015fab 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ endif
 .PHONY: go-lint
 
 golangci-lint:
-	@test -s $(go env GOPATH)/bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+	@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
 
 # Run the golangci-lint tool
 go-lint: golangci-lint

From c3178904b4a95c27a56dce06fa4d9de6bf4f37bc Mon Sep 17 00:00:00 2001
From: Michel Loiseleur <michel.loiseleur@traefik.io>
Date: Fri, 4 Aug 2023 09:56:32 +0200
Subject: [PATCH 5/5] fix: remove armv7 build

---
 .github/workflows/staging-image-tester.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/staging-image-tester.yml b/.github/workflows/staging-image-tester.yml
index 9cda18f5d..138674e6f 100644
--- a/.github/workflows/staging-image-tester.yml
+++ b/.github/workflows/staging-image-tester.yml
@@ -44,9 +44,3 @@ jobs:
 
     - name: Clean
       run: make clean
-
-    - name: Test build on armv7
-      run: make build.image-arm/v7
-
-    - name: Clean
-      run: make clean