From 2ebc063946e91de62fa6054bed50d02477111772 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 07:38:19 -0700 Subject: [PATCH 1/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 27e3b52..71bea2d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: - name: save tackle2-addon-analyzer image run: | - IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker + IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker docker save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest - name: Upload tackle2-addon-analyzer image as artifact From f44b573fdc90ed308a66eb7bae7d65ca51940f1c Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 07:46:44 -0700 Subject: [PATCH 2/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/ci.yaml | 2 +- .github/workflows/image-build.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 71bea2d..27e3b52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: - name: save tackle2-addon-analyzer image run: | - IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker + IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker docker save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest - name: Upload tackle2-addon-analyzer image as artifact diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml index d3df7c5..31b656d 100644 --- a/.github/workflows/image-build.yaml +++ b/.github/workflows/image-build.yaml @@ -17,6 +17,7 @@ jobs: image-build: uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main with: + go-version: '1.21' registry: "quay.io/konveyor" image_name: "tackle2-addon-analyzer" containerfile: "./Dockerfile" From 3d9a7bd7e2e5fcd82042d746fa160347bdb47fa9 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 07:48:50 -0700 Subject: [PATCH 3/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/image-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml index 31b656d..59c0175 100644 --- a/.github/workflows/image-build.yaml +++ b/.github/workflows/image-build.yaml @@ -17,7 +17,7 @@ jobs: image-build: uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main with: - go-version: '1.21' + go-version: '1.22' registry: "quay.io/konveyor" image_name: "tackle2-addon-analyzer" containerfile: "./Dockerfile" From 527ffbfaa29e4c6ec99661232abbfaf6fe7d886a Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 07:52:52 -0700 Subject: [PATCH 4/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/ci.yaml | 2 ++ .github/workflows/image-build.yaml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 27e3b52..61595e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,6 +16,8 @@ jobs: run: | IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker docker save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest + with: + go-version: '1.22' - name: Upload tackle2-addon-analyzer image as artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml index 59c0175..d3df7c5 100644 --- a/.github/workflows/image-build.yaml +++ b/.github/workflows/image-build.yaml @@ -17,7 +17,6 @@ jobs: image-build: uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main with: - go-version: '1.22' registry: "quay.io/konveyor" image_name: "tackle2-addon-analyzer" containerfile: "./Dockerfile" From 3d00e409ef1bcf294f0a5c3823a3ee3eab791829 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 07:58:19 -0700 Subject: [PATCH 5/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/ci.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 61595e6..7787363 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker docker save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest with: - go-version: '1.22' + go-version: '1.21' - name: Upload tackle2-addon-analyzer image as artifact uses: actions/upload-artifact@v3 diff --git a/Makefile b/Makefile index 8b032e7..4eef87b 100644 --- a/Makefile +++ b/Makefile @@ -33,4 +33,4 @@ vet: # Ensure goimports installed. $(GOIMPORTS): - go install golang.org/x/tools/cmd/goimports@latest + go install golang.org/x/tools/cmd/goimports@v0.24 From 8f6f9a973462b2d2361547b204a4d0b191146b2c Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 16 Sep 2024 08:01:07 -0700 Subject: [PATCH 6/6] checkpoint Signed-off-by: Jeff Ortel --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7787363..27e3b52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,8 +16,6 @@ jobs: run: | IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-docker docker save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest - with: - go-version: '1.21' - name: Upload tackle2-addon-analyzer image as artifact uses: actions/upload-artifact@v3