From 2cbb998affb008cbd00dfb61277149c0079ced87 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 23 Sep 2023 18:44:30 -0500 Subject: [PATCH] build: use common workflows (#235) * build(deps): bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * build(deps): bump goreleaser/goreleaser-action from 4 to 5 Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 4 to 5. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/v4...v5) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * build(deps): bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * build(deps): bump k8s.io/apimachinery from 0.28.1 to 0.28.2 Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.28.1 to 0.28.2. - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.28.1...v0.28.2) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump golang.ngrok.com/ngrok from 1.4.0 to 1.4.1 Bumps [golang.ngrok.com/ngrok](https://github.com/ngrok/ngrok-go) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/ngrok/ngrok-go/releases) - [Changelog](https://github.com/ngrok/ngrok-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/ngrok/ngrok-go/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: golang.ngrok.com/ngrok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build: use common workflows * build(deps): upgrade k8s --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/dependabot.yml | 15 ++++++++++++++- .github/workflows/pr.yml | 15 --------------- .github/workflows/release.yml | 36 ++++------------------------------- .github/workflows/test.yml | 24 ++++------------------- go.mod | 8 ++++---- go.sum | 12 ++++++++---- 6 files changed, 34 insertions(+), 76 deletions(-) delete mode 100644 .github/workflows/pr.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0a50f4f..2b4ebac 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,20 @@ updates: directory: "/" schedule: interval: "weekly" + groups: + updates: + patterns: + - "*" + update-types: + - patch + - minor - package-ecosystem: "gomod" directory: "/" schedule: - interval: "weekly" + interval: "weekly" + groups: + patches: + patterns: + - "*" + update-types: + - patch diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index fc34c3e..0000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Validate PR - -on: - pull_request: - branches: [ master ] - -jobs: - test: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 - with: - go-version-file: 'go.mod' - - run: go test ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eff0324..ba1ed65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,35 +8,7 @@ on: jobs: release: - runs-on: ubuntu-20.04 - env: - DOCKER_CLI_EXPERIMENTAL: "enabled" - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version-file: 'go.mod' - - - name: Setup docker buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Docker login - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v4 - with: - version: latest - args: release --clean - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: itzg/github-workflows/.github/workflows/go-with-releaser-image.yml@main + secrets: + image-registry-username: ${{ secrets.DOCKERHUB_USERNAME }} + image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 302274a..15ffb32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,28 +1,12 @@ -name: test +name: Test on: push: branches: - master + pull_request: + branches: [ master ] jobs: build: - runs-on: ubuntu-20.04 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version-file: 'go.mod' - - - name: Test - run: go test ./... - - - name: Run GoReleaser Snapshot - uses: goreleaser/goreleaser-action@v4 - with: - version: latest - args: build --snapshot --rm-dist + uses: itzg/github-workflows/.github/workflows/go-test.yml@main diff --git a/go.mod b/go.mod index 68ca07d..001775e 100644 --- a/go.mod +++ b/go.mod @@ -12,11 +12,11 @@ require ( github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.4 - golang.ngrok.com/ngrok v1.4.0 + golang.ngrok.com/ngrok v1.4.1 golang.org/x/text v0.13.0 - k8s.io/api v0.28.1 - k8s.io/apimachinery v0.28.1 - k8s.io/client-go v0.28.1 + k8s.io/api v0.28.2 + k8s.io/apimachinery v0.28.2 + k8s.io/client-go v0.28.2 ) require ( diff --git a/go.sum b/go.sum index 3078b95..1640e96 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.ngrok.com/muxado/v2 v2.0.0 h1:bu9eIDhRdYNtIXNnqat/HyMeHYOAbUH55ebD7gTvW6c= golang.ngrok.com/muxado/v2 v2.0.0/go.mod h1:wzxJYX4xiAtmwumzL+QsukVwFRXmPNv86vB8RPpOxyM= -golang.ngrok.com/ngrok v1.4.0 h1:QhUJ2jZr1xyf80zFLJuUsdc8exf3fVebQgbvOyVSbbk= -golang.ngrok.com/ngrok v1.4.0/go.mod h1:8a8GVoqR305t0O51ld211Xq2UeKgm32o8px24ddvXZI= +golang.ngrok.com/ngrok v1.4.1 h1:z53H/hAqSJf+K5wL3v4m01Dp4rU0wcf323iMPBQ27QA= +golang.ngrok.com/ngrok v1.4.1/go.mod h1:8a8GVoqR305t0O51ld211Xq2UeKgm32o8px24ddvXZI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -215,10 +215,14 @@ gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo= gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= -k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= -k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= +k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= +k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= +k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= +k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= +k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=