Merge pull request #59 from jmatsu/feat/support_darwin_arm64

Support Darwin ARM64
jmatsu · Jun 25, 2022 · b19ec82 · b19ec82
2 parents 8a9e371 + af0b66f
commit b19ec82
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 78 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
     executors:
       default-executor:
         docker:
-          - image: circleci/golang:1.12
+          - image: circleci/golang:1.16
         working_directory: /go/src/github.com/jmatsu/terraform-provider-slack
         environment:
           - GO111MODULE=on

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,28 @@
+name: build
+
+on:
+  pull_request:
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.16
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v3
+        with:
+          version: latest
+          args: build --snapshot --rm-dist
+      -
+        uses: actions/upload-artifact@v3
+        with:
+          name: providers
+          path: dist/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,28 +21,33 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Unshallow
         run: git fetch --prune --unshallow
       -
         name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.14
+          go-version: 1.16
       -
         name: Import GPG key
         id: import_gpg
-        uses: paultyng/ghaction-import-gpg@v2.1.0
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v3
         with:
           version: latest
           args: release --rm-dist
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      -
+        uses: actions/upload-artifact@v3
+        with:
+          name: providers
+          path: dist/*
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -24,9 +24,13 @@ builds:
     - '386'
     - arm
     - arm64
-  ignore:
-    - goos: darwin
-      goarch: '386'
+  ignore: # followed https://github.com/hashicorp/terraform-provider-aws/blob/2590e6359b1ddb1354db633d3c731d119d0f6e97/.goreleaser.yml#L27
+    - goarch: arm
+      goos: windows
+    - goarch: arm64
+      goos: freebsd
+    - goarch: arm64
+      goos: windows
   binary: '{{ .ProjectName }}_v{{ .Version }}'
 archives:
 - format: zip

diff --git a/go.mod b/go.mod
@@ -7,5 +7,5 @@ require (
 	github.com/hashicorp/terraform v0.12.13
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/slack-go/slack v0.6.4
-	gopkg.in/djherbis/times.v1 v1.2.0
+	gopkg.in/djherbis/times.v1 v1.3.0
 )