Tweak compiler config

bakks · Oct 27, 2022 · e0b6562 · e0b6562
1 parent 23aff25
commit e0b6562
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,18 +2,17 @@ name: goreleaser
 
 on:
   push:
-    # run only against tags
     tags:
-      - '*'
+      - 'v*'
 
 permissions:
   contents: write
-  # packages: write
-  # issues: write
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    container:
+      image: goreleaser/goreleaser-cross
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -8,16 +8,12 @@ builds:
       - amd64
     env:
       - CGO_ENABLED=1
-      - PKG_CONFIG_SYSROOT_DIR=/sysroot/macos/amd64
-      - PKG_CONFIG_PATH=/sysroot/macos/amd64/usr/local/lib/pkgconfig
-      - CC=clang
-      - CXX=clang++
-      - 'CGO_CFLAGS=" -Wno-error=unused-command-line-argument "'
-      - 'CGO_LDFLAGS=" -Wno-error=unused-command-line-argument "'
+      - CC=o64-clang
+      - CXX=o64-clang++
     flags:
       - -mod=readonly
     ldflags:
-      - -s -w -X main.version={{.Version}} -Wno-error=unused-command-line-argument
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}}
 
   - id: darwin-arm64
     main: ./
@@ -28,16 +24,12 @@ builds:
       - arm64
     env:
       - CGO_ENABLED=1
-      - PKG_CONFIG_SYSROOT_DIR=/sysroot/macos/amd64
-      - PKG_CONFIG_PATH=/sysroot/macos/amd64/usr/local/lib/pkgconfig
-      - CC=clang
-      - CXX=clang++
-      - 'CGO_CFLAGS=" -Wno-error=unused-command-line-argument "'
-      - 'CGO_LDFLAGS=" -Wno-error=unused-command-line-argument "'
+      - CC=o64-clang
+      - CXX=o64-clang++
     flags:
       - -mod=readonly
     ldflags:
-      - -s -w -X main.version={{.Version}} -Wno-error=unused-command-line-argument
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}}
 
 
 release: