From 79efce0b18ce747fbeafe0871355fea50ddefc88 Mon Sep 17 00:00:00 2001 From: Andrew O'Neill Date: Thu, 4 Apr 2024 19:33:38 -0700 Subject: [PATCH 1/3] add controller-gen and client-gen versions to 1.22 builds This should add the proper controller-gen and client-gen versions to build with go 1.22. I'm not very familiar with github actions so let me know if there is a better way to include the defaults. Signed-off-by: Andrew O'Neill --- .github/workflows/image.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 93336416..a534ce0f 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -45,6 +45,13 @@ jobs: - "1.20.5" ispr: - ${{github.event_name == 'pull_request'}} + include: + - go-version: "1.22" + controller-gen-version: "v0.14.0" + client-gen-version: "v0.29.2" + - go-version: "1.22.1" + controller-gen-version: "v0.14.0" + client-gen-version: "v0.29.2" exclude: - ispr: true go-version: "1.21.4" @@ -91,4 +98,6 @@ jobs: platforms: ${{ env.IMAGE_PLATFORMS }} build-args: | GOLANG_VERSION=${{ matrix.go-version }} + CONTROLLER_GEN_VERSION=${{ matrix.controller-gen-version || "v0.9.2" }} + CLIENT_GEN_VERSION=${{ matrix.client-gen-version || "v0.26.1" }} tags: ghcr.io/nvidia/k8s-test-infra:devel-go${{ matrix.go-version }} From 764f2a85b29191052d2fa4631260997b284947ed Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Fri, 5 Apr 2024 12:03:55 +0200 Subject: [PATCH 2/3] remove test action Signed-off-by: Carlos Eduardo Arango Gutierrez Signed-off-by: Andrew O'Neill --- .github/workflows/test.yaml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml deleted file mode 100644 index 5b0f2558..00000000 --- a/.github/workflows/test.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: "Test issue comments" -on: - issue_comment: - types: [created] - -jobs: - execute: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v1 - - uses: ./ - with: - github-token: ${{ secrets.GITHUB_TOKEN }} From 0dce9a65c7b7136a23b4e92f2b3838f5c1ec373a Mon Sep 17 00:00:00 2001 From: Andrew O'Neill Date: Fri, 5 Apr 2024 06:28:58 -0700 Subject: [PATCH 3/3] string literals need to be wrapped with single quote Signed-off-by: Andrew O'Neill --- .github/workflows/image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index a534ce0f..bf9d0d0a 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -98,6 +98,6 @@ jobs: platforms: ${{ env.IMAGE_PLATFORMS }} build-args: | GOLANG_VERSION=${{ matrix.go-version }} - CONTROLLER_GEN_VERSION=${{ matrix.controller-gen-version || "v0.9.2" }} - CLIENT_GEN_VERSION=${{ matrix.client-gen-version || "v0.26.1" }} + CONTROLLER_GEN_VERSION=${{ matrix.controller-gen-version || 'v0.9.2' }} + CLIENT_GEN_VERSION=${{ matrix.client-gen-version || 'v0.26.1' }} tags: ghcr.io/nvidia/k8s-test-infra:devel-go${{ matrix.go-version }}