From 5f70f2812d0971a00f9487ad66fb9f21107f0fef Mon Sep 17 00:00:00 2001 From: Michele Degges Date: Tue, 14 Dec 2021 17:46:04 -0800 Subject: [PATCH 1/2] Add darwin arm64 suport --- .github/workflows/build.yml | 8 ++++++-- .release/ci.hcl | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1e28d2e7f..0bf22e9c5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,11 @@ name: build on: push: # Sequence of patterns matched against refs/heads - branches: [ main ] + branches: [ + "main", + # Remove before merging + "support-darwin-arm64" + ] env: PKG_NAME: consul @@ -169,7 +173,7 @@ jobs: strategy: matrix: goos: [ darwin ] - goarch: [ "amd64" ] + goarch: [ "amd64", "arm64" ] go: [ "1.17.5" ] fail-fast: true diff --git a/.release/ci.hcl b/.release/ci.hcl index b248590b83..597c00045c 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -14,7 +14,8 @@ project "consul" { "release/1.8.x", "release/1.9.x", "release/1.10.x", - "release/1.11.x" + "release/1.11.x", + "support-darwin-arm64" ] } } From 03507b505363a7f04411e017195a689e7203c20c Mon Sep 17 00:00:00 2001 From: Michele Degges Date: Tue, 14 Dec 2021 18:19:14 -0800 Subject: [PATCH 2/2] Removing test branch --- .github/workflows/build.yml | 4 +--- .release/ci.hcl | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bf22e9c5a..850f2b9b55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,7 @@ on: push: # Sequence of patterns matched against refs/heads branches: [ - "main", - # Remove before merging - "support-darwin-arm64" + "main" ] env: diff --git a/.release/ci.hcl b/.release/ci.hcl index 597c00045c..b248590b83 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -14,8 +14,7 @@ project "consul" { "release/1.8.x", "release/1.9.x", "release/1.10.x", - "release/1.11.x", - "support-darwin-arm64" + "release/1.11.x" ] } }