Skip to content

Modern Docker Management, Designed for Everyone

fix: only release arcane-cli on apple silicon (arm64) drop amd64 support

Kyle Mendellb3acb52dd02f
diff --git a/.depot/workflows/build-next-images.yml b/.depot/workflows/build-next-images.yml
index 5bb28d665..ee34c3abb 100644
--- a/.depot/workflows/build-next-images.yml
+++ b/.depot/workflows/build-next-images.yml
@@ -59,7 +59,12 @@ jobs:
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: backend/go.mod
- cache-dependency-path: backend/go.sum
+ cache: true
+ cache-dependency-path: |
+ go.work
+ go.work.sum
+ */go.mod
+ */go.sum
- name: Capture frontend build versions
id: frontend-versions
diff --git a/.depot/workflows/ci.yml b/.depot/workflows/ci.yml
index d44eb0d81..65f228562 100644
--- a/.depot/workflows/ci.yml
+++ b/.depot/workflows/ci.yml
@@ -55,7 +55,11 @@ jobs:
with:
go-version-file: ${{ matrix.module.path }}/go.mod
cache: true
- cache-dependency-path: ${{ matrix.module.path }}/go.sum
+ cache-dependency-path: &go-cache-dependencies |
+ go.work
+ go.work.sum
+ */go.mod
+ */go.sum
- name: Download modules
run: just deps install ${{ matrix.module.name }}
@@ -103,7 +107,7 @@ jobs:
with:
go-version-file: ${{ matrix.module.name }}/go.mod
cache: true
- cache-dependency-path: ${{ matrix.module.name }}/go.sum
+ cache-dependency-path: *go-cache-dependencies
- name: Run Golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
@@ -252,7 +256,7 @@ jobs:
with:
go-version-file: cli/go.mod
cache: true
- cache-dependency-path: cli/go.sum
+ cache-dependency-path: *go-cache-dependencies
- name: Set up Depot CLI
uses: depot/setup-action@91bc8495a33ebfc504ffc89e5674379ccf23c29c # v1.7.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 589e50628..a0da5dea4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,11 @@ jobs:
with:
go-version-file: ${{ matrix.module.path }}/go.mod
cache: true
- cache-dependency-path: ${{ matrix.module.path }}/go.sum
+ cache-dependency-path: &go-cache-dependencies |
+ go.work
+ go.work.sum
+ */go.mod
+ */go.sum
- name: Install GCC
if: matrix.module.gcc
@@ -105,7 +109,8 @@ jobs:
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: ${{ matrix.module.name }}/go.mod
- cache-dependency-path: ${{ matrix.module.name }}/go.sum
+ cache: true
+ cache-dependency-path: *go-cache-dependencies
- name: Run Golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
@@ -244,7 +249,8 @@ jobs:
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: cli/go.mod
- cache-dependency-path: cli/go.sum
+ cache: true
+ cache-dependency-path: *go-cache-dependencies
- name: Set up Depot CLI
uses: depot/setup-action@91bc8495a33ebfc504ffc89e5674379ccf23c29c # v1.7.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d338a116b..03eb63094 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -175,20 +175,16 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- - name: Install Frontend Dependencies
- run: just deps install frontend
-
- - name: Build Arcane Frontend
- run: just build single frontend
-
- name: Setup Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: backend/go.mod
cache: true
cache-dependency-path: |
- backend/go.sum
- cli/go.sum
+ go.work
+ go.work.sum
+ */go.mod
+ */go.sum
- name: Install envsubst
run: sudo apt-get update && sudo apt-get install -y gettext-base
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index ea3615628..399a9d012 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -116,6 +116,8 @@ builds:
goriscv64:
- rva20u64
ignore:
+ - goos: darwin
+ goarch: amd64
- goos: darwin
goarch: riscv64
ldflags:
@@ -133,18 +135,24 @@ archives:
- arcane-cli
formats:
- tar.gz
- name_template: '{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}'
+ name_template: &binary-name '{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}'
+ - id: arcane-cli-binary
+ ids:
+ - arcane-cli
+ formats:
+ - binary
+ name_template: *binary-name
- id: default
ids:
- arcane
- arcane-agent
formats:
- binary
- name_template: '{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}'
+ name_template: *binary-name
notarize:
macos:
- - enabled: '{{ isEnvSet "MACOS_SIGN_P12" }}'
+ - enabled: '{{ not .IsSnapshot }}'
ids:
- arcane-cli
sign:
@@ -162,7 +170,6 @@ signs:
cmd: cosign
artifacts: checksum
signature: '${artifact}.sigstore.json'
- stdin: '{{ .Env.COSIGN_PASSWORD }}'
args:
- sign-blob
- --key=env://COSIGN_PRIVATE_KEY
@@ -171,23 +178,6 @@ signs:
- --yes
output: true
-checksum:
- extra_files:
- - glob: 'dist/arcane-cli_linux_amd64_v1/arcane-cli'
- name_template: arcane-cli_linux_amd64
- - glob: 'dist/arcane-cli_linux_arm64_v8.0/arcane-cli'
- name_template: arcane-cli_linux_arm64
- - glob: 'dist/arcane-cli_linux_386_sse2/arcane-cli'
- name_template: arcane-cli_linux_386
- - glob: 'dist/arcane-cli_linux_arm_7/arcane-cli'
- name_template: arcane-cli_linux_armv7
- - glob: 'dist/arcane-cli_linux_riscv64_rva20u64/arcane-cli'
- name_template: arcane-cli_linux_riscv64
- - glob: 'dist/arcane-cli_darwin_amd64_v1/arcane-cli'
- name_template: arcane-cli_darwin_amd64
- - glob: 'dist/arcane-cli_darwin_arm64_v8.0/arcane-cli'
- name_template: arcane-cli_darwin_arm64
-
nightly:
version_template: '{{ .Env.NEXT_IMAGE_VERSION }}'
@@ -333,12 +323,10 @@ dockers_v2:
sbom: '{{ if eq (index .Env "BUILD_NEXT") "true" }}false{{ else }}true{{ end }}'
docker_signs:
- - id: cosign-images
- cmd: cosign
+ - cmd: cosign
ids:
- arcane-image
- arcane-agent-image
- stdin: '{{ .Env.COSIGN_PASSWORD }}'
args:
- sign
- --key=env://COSIGN_PRIVATE_KEY
@@ -352,22 +340,10 @@ blobs:
region: auto
bucket: '{{ index .Env "R2_BUCKET" }}'
directory: bin/cli-next
- extra_files_only: true
+ ids:
+ - arcane-cli-binary
+ if: '{{ eq .ArtifactID "arcane-cli-binary" }}'
extra_files:
- - glob: dist/arcane-cli_linux_amd64_v1/arcane-cli
- name_template: arcane-cli_linux_amd64
- - glob: dist/arcane-cli_linux_arm64_v8.0/arcane-cli
- name_template: arcane-cli_linux_arm64
- - glob: dist/arcane-cli_linux_386_sse2/arcane-cli
- name_template: arcane-cli_linux_386
- - glob: dist/arcane-cli_linux_arm_7/arcane-cli
- name_template: arcane-cli_linux_armv7
- - glob: dist/arcane-cli_linux_riscv64_rva20u64/arcane-cli
- name_template: arcane-cli_linux_riscv64
- - glob: dist/arcane-cli_darwin_amd64_v1/arcane-cli
- name_template: arcane-cli_darwin_amd64
- - glob: dist/arcane-cli_darwin_arm64_v8.0/arcane-cli
- name_template: arcane-cli_darwin_arm64
- glob: dist/arcane_*_checksums.txt
name_template: arcane-cli_checksums.txt
- glob: dist/arcane_*_checksums.txt.sigstore.json
@@ -428,6 +404,11 @@ announce:
icon_url: 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png'
release:
+ ids:
+ - default
+ - arcane-cli-archive
+ - arcane-cli
+ - cosign-checksums
github:
owner: getarcaneapp
name: arcane
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 20c3b8757..fab11c303 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -49,7 +49,8 @@ COPY .arcane.json ../arcane.json
COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
COPY --from=frontend-builder /tmp/arcane-frontend-build.env /tmp/arcane-frontend-build.env
-RUN --mount=type=cache,target=/root/.cache/go-build \
+RUN --mount=type=cache,target=/go/pkg/mod \
+ --mount=type=cache,target=/root/.cache/go-build \
. /tmp/arcane-frontend-build.env && \
if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
diff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agent
index 5cda9067b..973d1bb2f 100644
--- a/docker/Dockerfile-agent
+++ b/docker/Dockerfile-agent
@@ -26,7 +26,8 @@ RUN --mount=type=cache,target=/go/pkg/mod \
COPY backend ./
COPY .arcane.json ../arcane.json
-RUN --mount=type=cache,target=/root/.cache/go-build \
+RUN --mount=type=cache,target=/go/pkg/mod \
+ --mount=type=cache,target=/root/.cache/go-build \
if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
if [ "${BUILD_TIME}" = "unknown" ]; then BUILD_TIME=$(jq -r '.buildTime // "unknown"' ../arcane.json); fi && \