Skip to content

Commit

Permalink
Merge branch 'main' into handle-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
goruha committed May 3, 2024
2 parents 886f26d + d098e18 commit 33b9605
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 144 deletions.
54 changes: 0 additions & 54 deletions .github/auto-release.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These settings are synced to GitHub by https://probot.github.io/apps/settings/
_extends: .github

repository:
# A URL with more information about the repository
homepage: https://cloudposse.com

# Either `true` to enable projects for this repository, or `false` to disable them.
# If projects are disabled for the organization, passing `true` will cause an API error.
has_projects: false

# Either `true` to enable the wiki for this repository, `false` to disable it.
has_wiki: false
26 changes: 0 additions & 26 deletions .github/workflows/auto-release.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/docker-promote.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Docker Promote

on:
push:
tags:
- "*"

permissions:
contents: read
packages: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false

jobs:
ci-docker:
runs-on: ubuntu-latest
steps:
- name: Set output
id: vars
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT

- uses: cloudposse/github-action-docker-promote@0.3.0
id: promote
with:
registry: ghcr.io
organization: "${{ github.event.repository.owner.login }}"
repository: "${{ github.event.repository.name }}"
login: "${{ github.actor }}"
password: "${{ secrets.GITHUB_TOKEN }}"
platforms: linux/amd64,linux/arm64
from: sha-${{ github.sha }}
to: ${{ steps.vars.outputs.tag }}
use_metadata: false
25 changes: 0 additions & 25 deletions .github/workflows/docker.yml

This file was deleted.

58 changes: 51 additions & 7 deletions .github/workflows/feature-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,74 @@ on:
- synchronize
- reopened

push:
branches:
- main
- release/v*
paths-ignore:
- '.github/**'
- 'docs/**'
- 'examples/**'
- 'test/**'

permissions:
contents: read
packages: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false

jobs:
build:
ci-go:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version-file: go.mod

- name: Test Snapshot Release
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v5
with:
distribution: goreleaser
version: latest
args: release --clean --snapshot
args: release --config ./dev.goreleaser.yaml --clean --snapshot

- name: Upload Test Release Assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: github-status-updater
path: dist/*
retention-days: 3

ci-docker:
runs-on: ubuntu-latest
steps:
- name: "Checkout source code at current commit"
uses: actions/checkout@v4

- name: Build
id: build
uses: cloudposse/github-action-docker-build-push@1.15.1
with:
registry: ghcr.io
organization: "${{ github.event.repository.owner.login }}"
repository: "${{ github.event.repository.name }}"
login: "${{ github.actor }}"
password: "${{ secrets.GITHUB_TOKEN }}"
platforms: linux/amd64,linux/arm64

release:
if: github.event_name == 'push'
needs: [ci-go, ci-docker]
uses: cloudposse/.github/.github/workflows/shared-go-auto-release.yml@main
with:
publish: true
format: binary
secrets: inherit
37 changes: 9 additions & 28 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
name: Release

on:
workflow_dispatch:

release:
types:
- published
types: [published]

permissions:
contents: write
permissions: {}

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: false

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '1.20'

- name: Public Release
uses: goreleaser/goreleaser-action@v4
with:
distribution: goreleaser
version: latest
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
perform:
uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/validate-codeowners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout source code at current commit"
uses: actions/checkout@v2
uses: actions/checkout@v4
- uses: mszostok/codeowners-validator@v0.7.1
if: github.event.pull_request.head.repo.full_name == github.repository
name: "Full check of CODEOWNERS"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ require github.com/google/go-github/v42 v42.0.0

require (
github.com/google/go-querystring v1.1.0 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5Px
github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 comments on commit 33b9605

Please sign in to comment.