diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 42927a0..5dda95e 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -90,7 +90,7 @@ jobs: go install github.com/goreleaser/goreleaser/v2@v2.12.7 - name: Release run: | - goreleaser release -f macos.goreleaser.yml --skip=validate --clean + goreleaser release -f goreleaser.yml --skip=validate --clean env: GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }} HOMEBREW_TAP_PRIVATE_KEY: ${{ secrets.HOMEBREW_TAP_PRIVATE_KEY }} @@ -99,26 +99,3 @@ jobs: MACOS_NOTARY_KEY: ${{ secrets.MACOS_NOTARY_KEY }} MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }} MACOS_NOTARY_ISSUER_ID: ${{ secrets.MACOS_NOTARY_ISSUER_ID }} - -# release-linux: -# needs: build -# runs-on: ubuntu-latest -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# - name: Setup Go -# uses: actions/setup-go@v3 -# with: -# go-version: 1.22 -# - name: Configure -# run: | -# git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" -# - name: Release -# uses: goreleaser/goreleaser-action@v1 -# if: startsWith(github.ref, 'refs/tags/') -# with: -# version: latest -# args: release -f linux.goreleaser.yml --skip=validate --clean -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# HOMEBREW_GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }} \ No newline at end of file diff --git a/macos.goreleaser.yml b/goreleaser.yml similarity index 73% rename from macos.goreleaser.yml rename to goreleaser.yml index 7e0902b..43fafa4 100644 --- a/macos.goreleaser.yml +++ b/goreleaser.yml @@ -1,12 +1,20 @@ version: 2 builds: - - id: ted + - id: ted_macos targets: - darwin_amd64 - darwin_arm64 env: - - CGO_ENABLED=1 + - CGO_ENABLED=0 + main: . + binary: ted + - id: ted_linux + targets: + - linux_amd64 + - linux_arm64 + env: + - CGO_ENABLED=0 main: . binary: ted @@ -14,7 +22,7 @@ notarize: macos: - enabled: true ids: - - ted + - ted_macos sign: certificate: "{{.Env.MACOS_SIGN_P12}}" password: "{{.Env.MACOS_SIGN_PASSWORD}}" @@ -26,7 +34,15 @@ notarize: timeout: 20m archives: - - id: tgz + - id: macos_tgz + ids: + - ted_macos + wrap_in_directory: false + formats: + - tar.gz + - id: linux_tgz + ids: + - ted_linux wrap_in_directory: false formats: - tar.gz @@ -36,10 +52,13 @@ release: owner: cmd name: ted ids: - - tgz + - macos_tgz + - linux_tgz homebrew_casks: - name: ted + ids: + - ted_macos repository: owner: casks name: dynamo-browse diff --git a/linux.goreleaser.yml b/linux.goreleaser.yml deleted file mode 100644 index d061c75..0000000 --- a/linux.goreleaser.yml +++ /dev/null @@ -1,37 +0,0 @@ -builds: - - id: ted - targets: - - windows_amd64 - - linux_amd64 - env: - - CGO_ENABLED=1 - main: ./cmd/ted/. - binary: dynamo-browse -archives: - - id: zip - builds: - - ted - wrap_in_directory: true - format_overrides: - - goos: windows - format: zip - - goos: linux - format: tar.gz -nfpms: - - id: package_nfpms - package_name: audax - builds: - - ted - vendor: lmika - homepage: https://ted.lmika.dev/ - maintainer: Leon Mika - description: TUI tools for working with CSV files - license: MIT - formats: - - deb - - rpm - bindir: /usr/local/bin -checksum: - name_template: 'checksums.txt' -snapshot: - name_template: "{{ .Tag }}-next" \ No newline at end of file