From 389e306c711b767ef30a2cb2e2d45fe64e4e288f Mon Sep 17 00:00:00 2001 From: Lar Van Der Jagt Date: Sat, 19 Apr 2025 15:40:43 -0400 Subject: [PATCH 1/2] ci: update engine release workflow --- .github/goreleaser/.goreleaser-darwin.yml | 20 +- .github/goreleaser/.goreleaser-linux.yml | 10 +- .github/goreleaser/.goreleaser-windows.yml | 10 +- .github/workflows/engine-release.yaml | 221 +++++++++++---------- .github/workflows/tag-engine-release.yaml | 9 +- 5 files changed, 138 insertions(+), 132 deletions(-) diff --git a/.github/goreleaser/.goreleaser-darwin.yml b/.github/goreleaser/.goreleaser-darwin.yml index 0e10e7dab..fa561a193 100644 --- a/.github/goreleaser/.goreleaser-darwin.yml +++ b/.github/goreleaser/.goreleaser-darwin.yml @@ -29,7 +29,7 @@ builds: # - SDKROOT=/Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk # - MACOSX_DEPLOYMENT_TARGET=11.1 ldflags: - - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/wundergraph/wundergraph/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} + - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/bff-backup/code/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} goos: - darwin goarch: @@ -80,12 +80,12 @@ release: header: | This is a new release of the command-line interface (CLI) {{.ProjectName}}. It allows you to create, deploy and manage your WunderGraph application. - Please check the [readme](https://github.com/wundergraph/wundergraph) or [documentation](https://wundergraph.com/docs) if you want to learn more. + Please check the [readme](https://github.com/bff-backup/code) or [documentation](https://wundergraph.com/docs) if you want to learn more. For breaking changes, please check the [migration](/docs/migrations) guidelines for more information. github: - owner: wundergraph - name: wundergraph + owner: bff-backup + name: code checksum: name_template: '{{ .ProjectName }}_{{ .Version }}_darwin_checksums.txt' # .goreleaser.yml @@ -110,8 +110,8 @@ brews: # GitHub/GitLab repository to push the formula to tap: - owner: wundergraph - name: homebrew-wundergraph + owner: bff-backup + name: homebrew-bff-backup # Optionally a branch can be provided. If the branch does not exist, it # will be created. If no branch is listed, the default branch will be used branch: main @@ -122,9 +122,9 @@ brews: # Default for github is "https://github.com///releases/download/{{ .Tag }}/{{ .ArtifactName }}" # Default for gitlab is "https://gitlab.com///-/releases/{{ .Tag }}/downloads/{{ .ArtifactName }}" # Default for gitea is "https://gitea.com///releases/download/{{ .Tag }}/{{ .ArtifactName }}" - # https://github.com/wundergraph/wundergraph/releases/download/v0.40.0/wunderctl_0.40.0_Darwin_x86_64.tar.gz + # https://github.com/bff-backup/code/releases/download/v0.40.0/wunderctl_0.40.0_Darwin_x86_64.tar.gz # url_template: "http://github.com/foo/bar/releases/{{ .Tag }}/{{ .ArtifactName }}" - url_template: 'https://github.com/wundergraph/wundergraph/releases/download/v{{ .Tag }}/{{ .ArtifactName }}' + url_template: 'https://github.com/bff-backup/code/releases/download/v{{ .Tag }}/{{ .ArtifactName }}' # Allows you to set a custom download strategy. Note that you'll need # to implement the strategy and add it to your tap repository. @@ -147,11 +147,11 @@ brews: # Your app's homepage. # Default is empty. - homepage: 'https://wundergraph.com/' + homepage: 'https://codeconfab.com/' # Template of your app's description. # Default is empty. - description: 'wunderctl - the WunderGraph Command Line Interface' + description: 'wunderctl - the BFF Backup Command Line Interface' # SPDX identifier of your app's license. # Default is empty. diff --git a/.github/goreleaser/.goreleaser-linux.yml b/.github/goreleaser/.goreleaser-linux.yml index dffe817da..3c5e6c595 100644 --- a/.github/goreleaser/.goreleaser-linux.yml +++ b/.github/goreleaser/.goreleaser-linux.yml @@ -26,7 +26,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/wundergraph/wundergraph/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} + - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/bff-backup/bff-backup/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} goos: - linux goarch: @@ -74,13 +74,13 @@ release: name_template: 'Release {{.ProjectName}} {{.Tag}}' header: | This is a new release of the command-line interface (CLI) {{.ProjectName}}. - It allows you to create, deploy and manage your WunderGraph application. - Please check the [readme](https://github.com/wundergraph/wundergraph) or [documentation](https://wundergraph.com/docs) if you want to learn more. + It allows you to create, deploy and manage your BFF Backup application. + Please check the [readme](https://github.com/bff-backup/code) or [documentation](https://wundergraph.com/docs) if you want to learn more. For breaking changes, please check the [migration](/docs/migrations) guidelines for more information. github: - owner: wundergraph - name: wundergraph + owner: bff-backup + name: code checksum: name_template: '{{ .ProjectName }}_{{ .Version }}_linux_checksums.txt' diff --git a/.github/goreleaser/.goreleaser-windows.yml b/.github/goreleaser/.goreleaser-windows.yml index 9b4eb4f06..d2ed7e30d 100644 --- a/.github/goreleaser/.goreleaser-windows.yml +++ b/.github/goreleaser/.goreleaser-windows.yml @@ -15,7 +15,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/wundergraph/wundergraph/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} + - -w -s -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=ci -X main.githubAuthDemoClientID={{.Env.GH_AUTH_DEMO_CLIENT_ID}} -X main.githubAuthDemoClientSecret={{.Env.GH_AUTH_DEMO_CLIENT_SECRET}} -X github.com/bff-backup/code/cli/commands.licensingPublicKey={{.Env.LICENSING_PUBLIC_KEY}} goos: - windows goarch: @@ -64,12 +64,12 @@ release: name_template: 'Release {{.ProjectName}} {{.Tag}}' header: | This is a new release of the command-line interface (CLI) {{.ProjectName}}. - It allows you to create, deploy and manage your WunderGraph application. - Please check the [readme](https://github.com/wundergraph/wundergraph) or [documentation](https://wundergraph.com/docs) if you want to learn more. + It allows you to create, deploy and manage your BFF Backup application. + Please check the [readme](https://github.com/bff-backup/code) or [documentation](https://wundergraph.com/docs) if you want to learn more. For breaking changes, please check the [migration](/docs/migrations) guidelines for more information. github: - owner: wundergraph - name: wundergraph + owner: bff-backup + name: code checksum: name_template: '{{ .ProjectName }}_{{ .Version }}_windows_checksums.txt' diff --git a/.github/workflows/engine-release.yaml b/.github/workflows/engine-release.yaml index 8b968107a..eb4d433ab 100644 --- a/.github/workflows/engine-release.yaml +++ b/.github/workflows/engine-release.yaml @@ -11,62 +11,65 @@ concurrency: group: ${{github.workflow}}-${{github.head_ref}} cancel-in-progress: false -jobs: - goreleaser-darwin: - name: Release MacOS build - runs-on: 'macos-latest' - timeout-minutes: 20 - steps: - - name: checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.ref }} - - - uses: ./.github/actions/go - with: - working-directory: ${{ env.WORKING_DIRECTORY }} - - - name: Install Protoc - uses: abelfodil/protoc-action@v1 - with: - protoc-version: '21.5' - - - name: Install Gon - run: | - brew tap mitchellh/gon - brew install gon - - - name: Import Code-Signing Certificates - uses: Apple-Actions/import-codesign-certs@v1 - with: - p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} - p12-password: ${{ secrets.AC_PASSWORD }} - - - name: Show installed SDK's - run: xcodebuild -showsdks - - - name: generate go types based on protobuf definitions - run: make codegen-go +permissions: + contents: write - - name: Check if git is not dirty after generating files - run: git diff --no-ext-diff --exit-code - - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 - with: - version: latest - workdir: './cmd/wunderctl' - distribution: goreleaser-pro - args: release --rm-dist --config ./../../.github/goreleaser/.goreleaser-darwin.yml - env: - # custom PAT to push in https://github.com/wundergraph/homebrew-wundergraph - GITHUB_TOKEN: ${{ secrets.GH_TOKEN_GORELEASER }} - AC_PASSWORD: ${{ secrets.AC_PASSWORD }} - GH_AUTH_DEMO_CLIENT_ID: ${{ secrets.GH_AUTH_DEMO_CLIENT_ID }} - GH_AUTH_DEMO_CLIENT_SECRET: ${{ secrets.GH_AUTH_DEMO_CLIENT_SECRET }} - GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - LICENSING_PUBLIC_KEY: ${{ secrets.LICENSING_PUBLIC_KEY }} +jobs: + # goreleaser-darwin: + # name: Release MacOS build + # runs-on: 'macos-latest' + # timeout-minutes: 20 + # steps: + # - name: checkout + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 + # ref: ${{ github.event.client_payload.ref }} + + # - uses: ./.github/actions/go + # with: + # working-directory: ${{ env.WORKING_DIRECTORY }} + + # - name: Install Protoc + # uses: abelfodil/protoc-action@v1 + # with: + # protoc-version: '21.5' + + # - name: Install Gon + # run: | + # brew tap mitchellh/gon + # brew install gon + + # - name: Import Code-Signing Certificates + # uses: Apple-Actions/import-codesign-certs@v1 + # with: + # p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} + # p12-password: ${{ secrets.AC_PASSWORD }} + + # - name: Show installed SDK's + # run: xcodebuild -showsdks + + # - name: generate go types based on protobuf definitions + # run: make codegen-go + + # - name: Check if git is not dirty after generating files + # run: git diff --no-ext-diff --exit-code + + # - name: Run GoReleaser + # uses: goreleaser/goreleaser-action@v3 + # with: + # version: latest + # workdir: './cmd/wunderctl' + # distribution: goreleaser-pro + # args: release --rm-dist --config ./../../.github/goreleaser/.goreleaser-darwin.yml + # env: + # # custom PAT to push in https://github.com/wundergraph/homebrew-wundergraph + # GITHUB_TOKEN: ${{ secrets.GH_TOKEN_GORELEASER }} + # AC_PASSWORD: ${{ secrets.AC_PASSWORD }} + # GH_AUTH_DEMO_CLIENT_ID: ${{ secrets.GH_AUTH_DEMO_CLIENT_ID }} + # GH_AUTH_DEMO_CLIENT_SECRET: ${{ secrets.GH_AUTH_DEMO_CLIENT_SECRET }} + # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + # LICENSING_PUBLIC_KEY: ${{ secrets.LICENSING_PUBLIC_KEY }} goreleaser-linux: name: Release Linux build @@ -102,66 +105,66 @@ jobs: with: version: latest workdir: './cmd/wunderctl' - distribution: goreleaser-pro + distribution: goreleaser args: release --rm-dist --config ./../../.github/goreleaser/.goreleaser-linux.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} AC_PASSWORD: ${{ secrets.AC_PASSWORD }} GH_AUTH_DEMO_CLIENT_ID: ${{ secrets.GH_AUTH_DEMO_CLIENT_ID }} GH_AUTH_DEMO_CLIENT_SECRET: ${{ secrets.GH_AUTH_DEMO_CLIENT_SECRET }} - GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} LICENSING_PUBLIC_KEY: ${{ secrets.LICENSING_PUBLIC_KEY }} - goreleaser-win: - name: Release Windows build - runs-on: 'windows-latest' - timeout-minutes: 20 - steps: - - name: Prepare git - # To fix the EOL issues on Windows runners, we need to disable autocrlf. See actions/checkout#135 for more info. - # https://github.com/actions/checkout/issues/135#issuecomment-613361104 - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.ref }} - - - uses: ./.github/actions/go - with: - working-directory: ${{ env.WORKING_DIRECTORY }} - - - name: Install Protoc - uses: abelfodil/protoc-action@v1 - with: - protoc-version: '21.5' - - - name: go env - run: go env - - - name: generate go types based on protobuf definitions - run: make codegen-go - - - name: Check if git is not dirty after generating files - run: git diff --no-ext-diff --exit-code - - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 - with: - version: latest - workdir: './cmd/wunderctl' - distribution: goreleaser-pro - args: release --rm-dist --config ./../../.github/goreleaser/.goreleaser-windows.yml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - AC_PASSWORD: ${{ secrets.AC_PASSWORD }} - GH_AUTH_DEMO_CLIENT_ID: ${{ secrets.GH_AUTH_DEMO_CLIENT_ID }} - GH_AUTH_DEMO_CLIENT_SECRET: ${{ secrets.GH_AUTH_DEMO_CLIENT_SECRET }} - GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - LICENSING_PUBLIC_KEY: ${{ secrets.LICENSING_PUBLIC_KEY }} + # goreleaser-win: + # name: Release Windows build + # runs-on: 'windows-latest' + # timeout-minutes: 20 + # steps: + # - name: Prepare git + # # To fix the EOL issues on Windows runners, we need to disable autocrlf. See actions/checkout#135 for more info. + # # https://github.com/actions/checkout/issues/135#issuecomment-613361104 + # run: | + # git config --global core.autocrlf false + # git config --global core.eol lf + + # - name: checkout + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 + # ref: ${{ github.event.client_payload.ref }} + + # - uses: ./.github/actions/go + # with: + # working-directory: ${{ env.WORKING_DIRECTORY }} + + # - name: Install Protoc + # uses: abelfodil/protoc-action@v1 + # with: + # protoc-version: '21.5' + + # - name: go env + # run: go env + + # - name: generate go types based on protobuf definitions + # run: make codegen-go + + # - name: Check if git is not dirty after generating files + # run: git diff --no-ext-diff --exit-code + + # - name: Run GoReleaser + # uses: goreleaser/goreleaser-action@v3 + # with: + # version: latest + # workdir: './cmd/wunderctl' + # distribution: goreleaser-pro + # args: release --rm-dist --config ./../../.github/goreleaser/.goreleaser-windows.yml + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # AC_PASSWORD: ${{ secrets.AC_PASSWORD }} + # GH_AUTH_DEMO_CLIENT_ID: ${{ secrets.GH_AUTH_DEMO_CLIENT_ID }} + # GH_AUTH_DEMO_CLIENT_SECRET: ${{ secrets.GH_AUTH_DEMO_CLIENT_SECRET }} + # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + # LICENSING_PUBLIC_KEY: ${{ secrets.LICENSING_PUBLIC_KEY }} release-wunderctl: # https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions @@ -170,8 +173,8 @@ jobs: name: Release wunderctl wrapper needs: - goreleaser-linux - - goreleaser-win - - goreleaser-darwin + # - goreleaser-win + # - goreleaser-darwin runs-on: ubuntu-latest timeout-minutes: 20 steps: diff --git a/.github/workflows/tag-engine-release.yaml b/.github/workflows/tag-engine-release.yaml index c5c0d6f9c..b4b58fb7d 100644 --- a/.github/workflows/tag-engine-release.yaml +++ b/.github/workflows/tag-engine-release.yaml @@ -19,6 +19,9 @@ concurrency: group: ${{github.workflow}}-${{github.head_ref}} cancel-in-progress: false +permissions: + contents: write + jobs: tag-release: name: Create a new release @@ -26,8 +29,8 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@v3 - with: - token: ${{ secrets.GH_TOKEN_WORKFLOW_PUBLISH }} + # with: + # token: ${{ secrets.GH_TOKEN_WORKFLOW_PUBLISH }} - name: git config run: | @@ -54,6 +57,6 @@ jobs: uses: peter-evans/repository-dispatch@v2 with: token: ${{ secrets.GITHUB_TOKEN }} - repository: wundergraph/wundergraph + repository: bff-backup/code event-type: release-engine client-payload: '{"ref": "v${{ steps.tag.outputs.release_version }}"}' From 4bfe12f4e7932cf67030da67210aebb76899c72e Mon Sep 17 00:00:00 2001 From: supaspoida Date: Sat, 19 Apr 2025 19:43:49 +0000 Subject: [PATCH 2/2] ci(release): Release 0.181.0 --- package.json | 2 +- packages/wunderctl/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e27a5fc17..fa0aa68eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "0.180.0", + "version": "0.181.0", "name": "bff-backup", "license": "Apache-2.0", "author": { diff --git a/packages/wunderctl/package.json b/packages/wunderctl/package.json index 028fd5ba1..3cd6fed5a 100644 --- a/packages/wunderctl/package.json +++ b/packages/wunderctl/package.json @@ -1,6 +1,6 @@ { "name": "@bff-backup/wunderctl", - "version": "0.180.0", + "version": "0.181.0", "license": "Apache-2.0", "description": "BFF Backup Command Line Interface", "main": "./dist/index.js",