Skip to content

Commit

Permalink
Merge branch 'main' into chore/update-reuse-rules
Browse files Browse the repository at this point in the history
  • Loading branch information
aobort committed Jun 3, 2024
2 parents c4a050b + 0840187 commit 0acf5e7
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 79 deletions.
8 changes: 7 additions & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,15 @@ autolabeler:
- '/fix\/.+/'
title:
- '/fix/i'
- label: 'enhancement'
- label: 'feature'
branch:
- '/feature\/.+/'
- label: 'enhancement'
branch:
- '/enh\/.+/'
- label: 'chore'
branch:
- '/chore\/.+/'
template: |
## Changes
$CHANGES
11 changes: 6 additions & 5 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
name: Enable auto-merge

on: pull_request
on: pull_request_target


permissions:
pull-requests: write
contents: write

jobs:
auto-merge:
name: Enable auto-merge
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: write
#if: ${{ (github.event.pull_request.draft == false) && (github.event.pull_request.user.login == 'dependabot[bot]') }}
if: ${{ github.event.pull_request.draft == false }}
steps:
- name: Set up CLI
uses: ksivamuthu/actions-setup-gh-cli@v2
uses: ksivamuthu/actions-setup-gh-cli@v3
- name: Enable auto-merge
run: gh pr merge --auto --squash "$PR_URL"
env:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Draft release

on:
pull_request_target:
push:
branches:
- main
Expand All @@ -13,11 +14,15 @@ jobs:
release-drafter:
name: Draft release
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- name: Draft release
uses: release-drafter/release-drafter@v6
with:
disable-releaser: github.ref != 'refs/heads/main'
config-name: release-drafter.yml
commitish: main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9 changes: 4 additions & 5 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ on:
- main
tags:
- v*
pull_request:

permissions:
contents: read
packages: write
pull_request_target:

jobs:
publish-docker:
name: Build and publish Docker image
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
44 changes: 22 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ module github.com/ironcore-dev/metal
go 1.22.2

require (
github.com/go-logr/logr v1.4.1
github.com/go-logr/logr v1.4.2
github.com/go-logr/zerologr v1.2.3
github.com/golangci/golangci-lint v1.58.1
github.com/golangci/golangci-lint v1.59.0
github.com/google/addlicense v1.1.1
github.com/google/uuid v1.6.0
github.com/hashicorp/go-multierror v1.1.1
github.com/ironcore-dev/ipam v0.2.1
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/rs/zerolog v1.32.0
github.com/rs/zerolog v1.33.0
github.com/sethvargo/go-password v0.3.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.18.2
github.com/stmcginnis/gofish v0.17.0
github.com/spf13/viper v1.19.0
github.com/stmcginnis/gofish v0.18.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
k8s.io/code-generator v0.30.1
k8s.io/klog/v2 v2.120.1
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
sigs.k8s.io/controller-runtime v0.18.2
sigs.k8s.io/controller-runtime v0.18.3
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240423173400-ed81fa696dea
sigs.k8s.io/controller-tools v0.15.0
sigs.k8s.io/kustomize/kustomize/v5 v5.4.1
sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
)

Expand All @@ -37,9 +37,9 @@ require (
github.com/4meepo/tagalign v1.3.4 // indirect
github.com/Abirdcfly/dupword v0.0.14 // indirect
github.com/Antonboom/errname v0.1.13 // indirect
github.com/Antonboom/nilnil v0.1.8 // indirect
github.com/Antonboom/testifylint v1.2.0 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Antonboom/nilnil v0.1.9 // indirect
github.com/Antonboom/testifylint v1.3.0 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
Expand Down Expand Up @@ -74,13 +74,13 @@ require (
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/ettle/strcase v0.2.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/firefart/nonamedreturns v1.0.5 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fzipp/gocyclo v0.6.0 // indirect
github.com/ghostiam/protogetter v0.3.6 // indirect
github.com/go-critic/go-critic v0.11.3 // indirect
github.com/go-critic/go-critic v0.11.4 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand Down Expand Up @@ -120,7 +120,7 @@ require (
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand All @@ -138,7 +138,7 @@ require (
github.com/kulti/thelper v0.6.3 // indirect
github.com/kunwardeep/paralleltest v1.0.10 // indirect
github.com/kyoh86/exportloopref v0.1.11 // indirect
github.com/lasiar/canonicalheader v1.0.6 // indirect
github.com/lasiar/canonicalheader v1.1.1 // indirect
github.com/ldez/gomoddirectives v0.2.4 // indirect
github.com/ldez/tagliatelle v0.5.0 // indirect
github.com/leonklingele/grouper v1.1.2 // indirect
Expand Down Expand Up @@ -186,7 +186,7 @@ require (
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect
github.com/securego/gosec/v2 v2.19.0 // indirect
github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sivchari/containedctx v1.0.3 // indirect
Expand Down Expand Up @@ -218,8 +218,8 @@ require (
github.com/yeya24/promlinter v0.3.0 // indirect
github.com/ykadowak/zerologlint v0.1.5 // indirect
gitlab.com/bosi/decorder v0.4.2 // indirect
go-simpler.org/musttag v0.12.1 // indirect
go-simpler.org/sloglint v0.6.0 // indirect
go-simpler.org/musttag v0.12.2 // indirect
go-simpler.org/sloglint v0.7.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand All @@ -243,14 +243,14 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
honnef.co/go/tools v0.4.7 // indirect
k8s.io/apiextensions-apiserver v0.30.0 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
mvdan.cc/gofumpt v0.6.0 // indirect
mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.17.1 // indirect
sigs.k8s.io/kustomize/cmd/config v0.14.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.0 // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/cmd/config v0.14.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 0acf5e7

Please sign in to comment.