From f5516c7043a0e4657dbc389de49a31b385ab529e Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 31 May 2024 13:14:48 +0100 Subject: [PATCH 01/11] Bump up integration generator server and ci go version Signed-off-by: thepetk --- .ci/Dockerfile | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/codecov.yaml | 2 +- .github/workflows/pushimage-next.yaml | 6 ++-- README.md | 2 +- index/generator/go.mod | 2 +- index/generator/go.sum | 35 ++++++++++++++++++++++ index/server/Dockerfile | 2 +- index/server/go.mod | 2 +- index/server/go.sum | 43 +++++++++++++++++++++++++++ tests/integration/Dockerfile | 4 +++ tests/integration/go.mod | 2 +- tests/integration/go.sum | 39 ++++++++++++++++++++++++ 13 files changed, 132 insertions(+), 11 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 843d85eee..af17cc32c 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-alpine@sha256:0ec0646e208ea58e5d29e558e39f2e59fccf39b7bda306cb53bbaff91919eca5 AS builder +FROM golang:1.21-alpine@sha256:3f8e3ad3e7c128d29ac3004ac8314967c5ddbfa5bfa7caa59b0de493fc01686a AS builder # Allows for the proper yq to be downloaded # This arg is automatically set if the dockerfile is built with --platform flag diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5c388b16a..dfdaec10f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ on: branches: [main] env: - GO_VERSION: 1.19 + GO_VERSION: 1.21 OAPI_CODEGEN_VERSION: v1.12.4 jobs: diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index 2c377a7d6..c0a0c509c 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -28,7 +28,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: 1.19 + go-version: 1.21 - name: Run tests run: cd index/server && go test ./... -coverprofile cover.out - name: Codecov diff --git a/.github/workflows/pushimage-next.yaml b/.github/workflows/pushimage-next.yaml index 38cb8c50b..29fda072e 100644 --- a/.github/workflows/pushimage-next.yaml +++ b/.github/workflows/pushimage-next.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: 1.19 + go-version: 1.21 - name: Set up QEMU # Enables arm64 image building uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 #v3.0.0 - name: Login to Quay @@ -40,7 +40,7 @@ jobs: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} - name: Build and push the index server base image - run: | + run: | cd index/server export GOPATH=$(go env GOPATH) go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.12.4 @@ -50,7 +50,7 @@ jobs: needs: indexServerBuild strategy: matrix: - repo: ['devfile/registry'] + repo: ["devfile/registry"] runs-on: ubuntu-latest steps: - name: Get the repository name and commit sha diff --git a/README.md b/README.md index 37b9e5dba..890369c92 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@