diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index bcf6e03..12bbb16 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -1,4 +1,4 @@ -FROM golang:1.22 as builder +FROM golang:1.23 as builder WORKDIR /go/src/app COPY . . RUN make manager diff --git a/.docker/Dockerfile-kubebuilder b/.docker/Dockerfile-kubebuilder index 18585c3..21364bd 100644 --- a/.docker/Dockerfile-kubebuilder +++ b/.docker/Dockerfile-kubebuilder @@ -1,4 +1,4 @@ -FROM golang:1.22 as builder +FROM golang:1.23 as builder WORKDIR /go/src/app ENV PATH=$PATH:/go/src/app/.bin diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 23b0643..f31a249 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.23" - name: Setup dependencies uses: ./.github/actions/deps-setup @@ -107,7 +107,7 @@ jobs: uses: ./.github/actions/deps-setup - uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" cache: false - name: Test run: make test-integration diff --git a/.github/workflows/closed_references.yml b/.github/workflows/closed_references.yml index 9a1b483..dfc4c5b 100644 --- a/.github/workflows/closed_references.yml +++ b/.github/workflows/closed_references.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest name: Find closed references steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v2-beta with: node-version: "14" diff --git a/.github/workflows/conventional_commits.yml b/.github/workflows/conventional_commits.yml index c4d3905..505a329 100644 --- a/.github/workflows/conventional_commits.yml +++ b/.github/workflows/conventional_commits.yml @@ -24,7 +24,7 @@ jobs: name: Validate PR title runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: config uses: ory/ci/conventional_commit_config@master with: diff --git a/.github/workflows/cve-scan.yaml b/.github/workflows/cve-scan.yaml index 8749c2d..45da796 100644 --- a/.github/workflows/cve-scan.yaml +++ b/.github/workflows/cve-scan.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v4 name: Setup Golang with: - go-version: "1.22" + go-version: "1.23" - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 91310e3..a89db6b 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - run: make format - name: Indicate formatting issues run: git diff HEAD --exit-code --color diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index e903667..1420059 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Synchronize Issue Labels uses: ory/label-sync-action@v0 with: diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 9326f59..d5df9e9 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - uses: actions/setup-node@v3 with: node-version: "18" diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ac48a5e..3e219a8 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: if: github.repository_owner == 'ory' runs-on: ubuntu-latest steps: - - uses: actions/stale@v4 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: | diff --git a/.goreleaser.yml b/.goreleaser.yml index 69aef78..874532c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,7 +1,7 @@ # This is an example goreleaser.yaml file with some sane defaults. # Make sure to check the documentation at http://goreleaser.com project_name: hydra-maester - +version: 2 before: hooks: - "go mod download" @@ -59,7 +59,7 @@ builds: - darwin snapshot: - name_template: "{{ .Tag }}-next" + version_template: "{{ .Tag }}-next" changelog: sort: asc @@ -69,7 +69,6 @@ dockers: - image_templates: - "oryd/hydra-maester:{{ .Tag }}-amd64" - "oryd/hydra-maester:{{ .ShortCommit }}-amd64" - - "oryd/hydra-maester:latest" goarch: amd64 build_flag_templates: - "--platform=linux/amd64" @@ -86,6 +85,18 @@ dockers: ids: - "linux-arm64" +docker_manifests: + - name_template: "oryd/hydra-maester:{{ .Tag }}" + id: "tag" + image_templates: + - "oryd/hydra-maester:{{ .Tag }}-amd64" + - "oryd/hydra-maester:{{ .Tag }}-arm64" + - name_template: "oryd/hydra-maester:latests" + id: "latests" + image_templates: + - "oryd/hydra-maester:{{ .Tag }}-amd64" + - "oryd/hydra-maester:{{ .Tag }}-arm64" + release: prerelease: auto name_template: "{{ .Tag }}" diff --git a/go.mod b/go.mod index 8bfcf30..1db030b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/ory/hydra-maester -go 1.22.0 - -toolchain go1.22.4 +go 1.23.2 require ( github.com/go-logr/logr v1.4.1