From 806da899c4df50ea9ef190a127b6bafa88635696 Mon Sep 17 00:00:00 2001 From: Andrew Magana Date: Thu, 2 Sep 2021 10:35:54 -0400 Subject: [PATCH 1/3] Add support for darwin/arm64. --- .github/workflows/go.yml | 2 +- .github/workflows/release.yml | 2 +- .goreleaser.yml | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 21000cca..481d4ae3 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14.x + go-version: 1.16.x - name: Build and Test run: make build test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5242f4e..abf6caa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.16.x - name: Import GPG key id: import_gpg uses: paultyng/ghaction-import-gpg@v2.1.0 diff --git a/.goreleaser.yml b/.goreleaser.yml index b4a446e8..8da3a233 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -27,9 +27,6 @@ builds: - '386' - arm - arm64 - ignore: - - goos: darwin - goarch: '386' binary: '{{ .ProjectName }}_v{{ .Version }}' archives: - format: zip From 79495f82837c44c1ce22cba0e4e4a7e1eb3f4cc6 Mon Sep 17 00:00:00 2001 From: Andrew Magana Date: Thu, 2 Sep 2021 10:44:59 -0400 Subject: [PATCH 2/3] bumped versions where needed. --- docs/guides/local_installation.md | 10 +++++----- examples/versions.tf | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/guides/local_installation.md b/docs/guides/local_installation.md index d1d286dc..184bb0a5 100644 --- a/docs/guides/local_installation.md +++ b/docs/guides/local_installation.md @@ -47,11 +47,11 @@ mkdir -p ~/.terraform.d/plugins && **One-liner download for macOS / Linux:** ```sh -mkdir -p ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.0/darwin_amd64 && - curl -Ls https://api.github.com/repos/Cox-Automotive/terraform-provider-alks/releases | jq -r --arg release "v2.0.0" --arg arch "$(uname -s | tr A-Z a-z)" '.[] | select(.tag_name | contains($release)) | .assets[]| select(.browser_download_url | contains($arch)) | select(.browser_download_url | contains("amd64")) | .browser_download_url' | - xargs -n 1 curl -Lo ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.0/darwin_amd64/terraform-provider-alks.zip && - pushd ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.0/darwin_amd64 && - unzip ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.0/darwin_amd64/terraform-provider-alks.zip -d terraform-provider-alks-tmp && +mkdir -p ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.4/darwin_amd64 && + curl -Ls https://api.github.com/repos/Cox-Automotive/terraform-provider-alks/releases | jq -r --arg release "v2.0.4" --arg arch "$(uname -s | tr A-Z a-z)" '.[] | select(.tag_name | contains($release)) | .assets[]| select(.browser_download_url | contains($arch)) | select(.browser_download_url | contains("amd64")) | .browser_download_url' | + xargs -n 1 curl -Lo ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.4/darwin_amd64/terraform-provider-alks.zip && + pushd ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.4/darwin_amd64 && + unzip ~/.terraform.d/plugins/Cox-Automotive/engineering-enablement/alks/2.0.4/darwin_amd64/terraform-provider-alks.zip -d terraform-provider-alks-tmp && mv terraform-provider-alks-tmp/terraform-provider-alks* . && chmod +x terraform-provider-alks* && rm -rf terraform-provider-alks-tmp && diff --git a/examples/versions.tf b/examples/versions.tf index 856b2d1a..6b241cb8 100644 --- a/examples/versions.tf +++ b/examples/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { alks = { source = "Cox-Automotive/alks" - version = "2.0.0" + version = "2.0.4" } aws = { source = "hashicorp/aws" From 8e1e8be747c30417ee242b6ed3cd20424c4c98b3 Mon Sep 17 00:00:00 2001 From: Andrew Magana Date: Thu, 2 Sep 2021 10:56:23 -0400 Subject: [PATCH 3/3] Ignore x86 - Apple no longer supports. --- .goreleaser.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index 8da3a233..b4a446e8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -27,6 +27,9 @@ builds: - '386' - arm - arm64 + ignore: + - goos: darwin + goarch: '386' binary: '{{ .ProjectName }}_v{{ .Version }}' archives: - format: zip