From 0f2c72c55c37d06eec53f9b79c52d9bbc9b8bf51 Mon Sep 17 00:00:00 2001
From: OneMatchFox <878612+onematchfox@users.noreply.github.com>
Date: Sat, 4 Nov 2023 16:22:08 +0100
Subject: [PATCH 1/3] build(deps-dev): bump versions in release workflow

---
 .github/workflows/release.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5b68079e..15e54ac1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,26 +10,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
         go-version: 1.19
 
     - name: Import GPG key
       id: import_gpg
-      uses: crazy-max/ghaction-import-gpg@v2
-      env:
-        GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      uses: crazy-max/ghaction-import-gpg@v6
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
 
     - name: Run GoReleaser
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v5
       with:
         version: latest
-        args: release --rm-dist
+        args: release --clean
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
\ No newline at end of file

From e2b247b81ac6a8b6f99920d65de93acc6b59a85a Mon Sep 17 00:00:00 2001
From: OneMatchFox <878612+onematchfox@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:00:26 +0100
Subject: [PATCH 2/3] build(deps-dev): bump versions in tests workflow

Leaving linting alone for the time being
---
 .github/workflows/tests.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 983c9cf7..055b3e36 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,10 +16,10 @@ jobs:
     steps:
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
+      uses: actions/setup-go@v4
       with:
         go-version-file: 'go.mod'
       id: go
@@ -51,10 +51,10 @@ jobs:
         argocd_version: ["v2.6.15", "v2.7.14", "v2.8.3"]
     steps:
       - name: Check out code
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
+        uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
           check-latest: true
@@ -64,9 +64,9 @@ jobs:
           curl -sL "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
           chmod +x ./kustomize
 
-      - name: Install Kind 0.11.1
+      - name: Install Kind 0.20.0
         run: |
-          curl -sLo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-$(uname)-amd64
+          curl -sLo ./kind https://kind.sigs.k8s.io/dl/v0.20.0/kind-$(uname)-amd64
           chmod +x ./kind
 
       - name: Set up ArgoCD ${{ matrix.argocd_version }}

From 8840d5df462d61b7f5f7d5bc658efa877d0f93ef Mon Sep 17 00:00:00 2001
From: Brian Fox <brian.fox@embark-studios.com>
Date: Tue, 7 Nov 2023 11:13:17 +0100
Subject: [PATCH 3/3] build: extend timeout on tests to 20m (matches the GitHub
 action)

---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 44795b02..ee2c9f15 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@ test:
 	go test -v -cover -timeout=120s -parallel=4 ./...
 
 testacc:
-	TF_ACC=1 go test -v -cover -timeout 15m ./...
+	TF_ACC=1 go test -v -cover -timeout 20m ./...
 
 testacc_clean_env:
 	kind delete cluster --name argocd