From 3352b676694b23a30bf6b9e13300346bc5196b3c Mon Sep 17 00:00:00 2001 From: John Allers Date: Mon, 17 Nov 2025 16:33:00 -0500 Subject: [PATCH] fix release --- .github/workflows/release.yaml | 67 +++++++--------------------------- .gon-amd64.json | 13 ------- .gon-arm64.json | 13 ------- .goreleaser.docker.yaml | 55 ---------------------------- 4 files changed, 13 insertions(+), 135 deletions(-) delete mode 100644 .gon-amd64.json delete mode 100644 .gon-arm64.json delete mode 100644 .goreleaser.docker.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1d5b60de..42a14bd0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,59 +3,18 @@ name: Release on: push: tags: - - '*' + - "*" jobs: - goreleaser: - runs-on: macos-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: 1.24.x - - name: Set up Gon - run: brew tap conductorone/gon && brew install conductorone/gon/gon - - name: Import Keychain Certs - uses: apple-actions/import-codesign-certs@v1 - with: - p12-file-base64: ${{ secrets.APPLE_SIGNING_KEY_P12 }} - p12-password: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }} - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v6 - with: - version: '~> v2' - args: release --clean - env: - GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} - AC_PASSWORD: ${{ secrets.AC_PASSWORD }} - AC_PROVIDER: ${{ secrets.AC_PROVIDER }} - goreleaser-docker: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: 1.24.x - - name: Docker Login - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.RELENG_GITHUB_TOKEN }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v6 - with: - version: '~> v2' - args: release --clean -f .goreleaser.docker.yaml - env: - GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} + release: + uses: ConductorOne/github-workflows/.github/workflows/release.yaml@v2 + with: + tag: ${{ github.ref_name }} + lambda: false + secrets: + RELENG_GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} + APPLE_SIGNING_KEY_P12: ${{ secrets.APPLE_SIGNING_KEY_P12 }} + APPLE_SIGNING_KEY_P12_PASSWORD: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }} + AC_PASSWORD: ${{ secrets.AC_PASSWORD }} + AC_PROVIDER: ${{ secrets.AC_PROVIDER }} + DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} diff --git a/.gon-amd64.json b/.gon-amd64.json deleted file mode 100644 index 328d066f..00000000 --- a/.gon-amd64.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "source": ["./dist/macos-amd64_darwin_amd64_v1/baton-sql-server"], - "bundle_id": "com.conductorone.baton-sql-server", - "apple_id": { - "username": "justin.gallardo@conductorone.com" - }, - "sign": { - "application_identity": "Developer ID Application: Justin Gallardo (858DKH55XL)" - }, - "zip": { - "output_path": "./dist/baton-sql-server-darwin-amd64.signed.zip" - } -} diff --git a/.gon-arm64.json b/.gon-arm64.json deleted file mode 100644 index 13ab3e31..00000000 --- a/.gon-arm64.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton-sql-server"], - "bundle_id": "com.conductorone.baton-sql-server", - "apple_id": { - "username": "justin.gallardo@conductorone.com" - }, - "sign": { - "application_identity": "Developer ID Application: Justin Gallardo (858DKH55XL)" - }, - "zip": { - "output_path": "./dist/baton-sql-server-darwin-arm64.signed.zip" - } -} diff --git a/.goreleaser.docker.yaml b/.goreleaser.docker.yaml deleted file mode 100644 index d8c024c5..00000000 --- a/.goreleaser.docker.yaml +++ /dev/null @@ -1,55 +0,0 @@ -version: 2 -project_name: baton-sql-server -builds: - - binary: baton-sql-server - env: - - CGO_ENABLED=0 - id: linux - main: ./cmd/baton-sql-server - goos: - - linux - goarch: - - amd64 - - arm64 -dockers: - - use: buildx - goos: linux - goarch: amd64 - image_templates: - - "ghcr.io/conductorone/baton-sql-server:{{ .Version }}-amd64" - - "ghcr.io/conductorone/baton-sql-server:latest-amd64" - build_flag_templates: - - "--platform=linux/amd64" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title=baton-sql-server" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/conductorone/baton-sql-server" - - use: buildx - goos: linux - goarch: arm64 - image_templates: - - "ghcr.io/conductorone/baton-sql-server:{{ .Version }}-arm64" - - "ghcr.io/conductorone/baton-sql-server:latest-arm64" - build_flag_templates: - - "--platform=linux/arm64/v8" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title=baton-sql-server" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/conductorone/baton-sql-server" -docker_manifests: - - name_template: ghcr.io/conductorone/baton-sql-server:{{ .Version }} - image_templates: - - ghcr.io/conductorone/baton-sql-server:{{ .Version }}-amd64 - - ghcr.io/conductorone/baton-sql-server:{{ .Version }}-arm64 - - name_template: ghcr.io/conductorone/baton-sql-server:latest - image_templates: - - ghcr.io/conductorone/baton-sql-server:latest-amd64 - - ghcr.io/conductorone/baton-sql-server:latest-arm64 -checksum: - disable: true -release: - disable: true -changelog: - disable: true \ No newline at end of file