chore: upgrade ci elements, bump golang version (#153)

This commit is contained in:
Jakub Błaszczyk 2024-10-14 15:18:13 +02:00 committed by GitHub
parent 44cd2371d9
commit 1b9449bb93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 26 additions and 17 deletions

View File

@ -1,4 +1,4 @@
FROM golang:1.22 as builder FROM golang:1.23 as builder
WORKDIR /go/src/app WORKDIR /go/src/app
COPY . . COPY . .
RUN make manager RUN make manager

View File

@ -1,4 +1,4 @@
FROM golang:1.22 as builder FROM golang:1.23 as builder
WORKDIR /go/src/app WORKDIR /go/src/app
ENV PATH=$PATH:/go/src/app/.bin ENV PATH=$PATH:/go/src/app/.bin

View File

@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: "1.22" go-version: "1.23"
- name: Setup dependencies - name: Setup dependencies
uses: ./.github/actions/deps-setup uses: ./.github/actions/deps-setup
@ -107,7 +107,7 @@ jobs:
uses: ./.github/actions/deps-setup uses: ./.github/actions/deps-setup
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: "1.22" go-version: "1.23"
cache: false cache: false
- name: Test - name: Test
run: make test-integration run: make test-integration

View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Find closed references name: Find closed references
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v4
- uses: actions/setup-node@v2-beta - uses: actions/setup-node@v2-beta
with: with:
node-version: "14" node-version: "14"

View File

@ -24,7 +24,7 @@ jobs:
name: Validate PR title name: Validate PR title
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- id: config - id: config
uses: ory/ci/conventional_commit_config@master uses: ory/ci/conventional_commit_config@master
with: with:

View File

@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
name: Setup Golang name: Setup Golang
with: with:
go-version: "1.22" go-version: "1.23"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx

View File

@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: "1.22" go-version: "1.23"
- run: make format - run: make format
- name: Indicate formatting issues - name: Indicate formatting issues
run: git diff HEAD --exit-code --color run: git diff HEAD --exit-code --color

View File

@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Synchronize Issue Labels - name: Synchronize Issue Labels
uses: ory/label-sync-action@v0 uses: ory/label-sync-action@v0
with: with:

View File

@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: "1.22" go-version: "1.23"
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: "18" node-version: "18"

View File

@ -12,7 +12,7 @@ jobs:
if: github.repository_owner == 'ory' if: github.repository_owner == 'ory'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v4 - uses: actions/stale@v9
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: | stale-issue-message: |

View File

@ -1,7 +1,7 @@
# This is an example goreleaser.yaml file with some sane defaults. # This is an example goreleaser.yaml file with some sane defaults.
# Make sure to check the documentation at http://goreleaser.com # Make sure to check the documentation at http://goreleaser.com
project_name: hydra-maester project_name: hydra-maester
version: 2
before: before:
hooks: hooks:
- "go mod download" - "go mod download"
@ -59,7 +59,7 @@ builds:
- darwin - darwin
snapshot: snapshot:
name_template: "{{ .Tag }}-next" version_template: "{{ .Tag }}-next"
changelog: changelog:
sort: asc sort: asc
@ -69,7 +69,6 @@ dockers:
- image_templates: - image_templates:
- "oryd/hydra-maester:{{ .Tag }}-amd64" - "oryd/hydra-maester:{{ .Tag }}-amd64"
- "oryd/hydra-maester:{{ .ShortCommit }}-amd64" - "oryd/hydra-maester:{{ .ShortCommit }}-amd64"
- "oryd/hydra-maester:latest"
goarch: amd64 goarch: amd64
build_flag_templates: build_flag_templates:
- "--platform=linux/amd64" - "--platform=linux/amd64"
@ -86,6 +85,18 @@ dockers:
ids: ids:
- "linux-arm64" - "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: release:
prerelease: auto prerelease: auto
name_template: "{{ .Tag }}" name_template: "{{ .Tag }}"

4
go.mod
View File

@ -1,8 +1,6 @@
module github.com/ory/hydra-maester module github.com/ory/hydra-maester
go 1.22.0 go 1.23.2
toolchain go1.22.4
require ( require (
github.com/go-logr/logr v1.4.1 github.com/go-logr/logr v1.4.1