Skip to content

Commit

Permalink
chore: upgrade ci elements, bump golang version (#153)
Browse files Browse the repository at this point in the history
  • Loading branch information
Demonsthere authored Oct 14, 2024
1 parent 44cd237 commit 1b9449b
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile-build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22 as builder
FROM golang:1.23 as builder
WORKDIR /go/src/app
COPY . .
RUN make manager
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile-kubebuilder
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/closed_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conventional_commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
17 changes: 14 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -59,7 +59,7 @@ builds:
- darwin

snapshot:
name_template: "{{ .Tag }}-next"
version_template: "{{ .Tag }}-next"

changelog:
sort: asc
Expand All @@ -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"
Expand All @@ -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 }}"
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1b9449b

Please sign in to comment.