Skip to content

Commit e83fe72

Browse files
authored
chore: update goreleaser docker config, use macos-15 (#2048)
Signed-off-by: Keming <kemingyang@tensorchord.ai>
1 parent 04a77fa commit e83fe72

File tree

4 files changed

+29
-50
lines changed

4 files changed

+29
-50
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ${{ matrix.os }}
4545
strategy:
4646
matrix:
47-
os: [macos-13, ubuntu-22.04]
47+
os: [macos-15, ubuntu-22.04]
4848
steps:
4949
- uses: actions/checkout@v5
5050
- name: Get gobin
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
python-version: '3.11'
7171
- name: Build wheels
72-
uses: pypa/cibuildwheel@v2.23.3
72+
uses: pypa/cibuildwheel@v3.2.1
7373
env:
7474
CIBW_ARCHS_MACOS: arm64, x86_64
7575
CIBW_ARCHS_LINUX: auto64

.goreleaser.yaml

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ builds:
4242
- -X github.com/tensorchord/envd/pkg/version.gitTreeState=clean
4343
archives:
4444
- id: envd
45-
format: binary
46-
builds:
45+
formats: ["binary"]
46+
ids:
4747
- envd
4848
name_template: >-
4949
{{ .Binary }}_{{ .Version }}_
@@ -52,8 +52,8 @@ archives:
5252
{{- else if eq .Arch "386" }}i386
5353
{{- else }}{{ .Arch }}{{ end }}
5454
- id: envd-sshd
55-
format: binary
56-
builds:
55+
formats: ["binary"]
56+
ids:
5757
- envd-sshd
5858
name_template: >-
5959
{{ .Binary }}_{{ .Version }}_
@@ -83,47 +83,24 @@ changelog:
8383
order: 3
8484
- title: 'Others:'
8585
order: 999
86-
dockers:
87-
- image_templates:
88-
- "tensorchord/envd-from-scratch:v{{ .Version }}-amd64"
89-
use: buildx
86+
dockers_v2:
87+
- id: "envd"
88+
images:
89+
- "tensorchord/envd-from-scratch"
9090
dockerfile: base-images/envd/envd.Dockerfile
91-
ids:
92-
- envd
93-
build_flag_templates:
94-
- "--platform=linux/amd64"
95-
- image_templates:
96-
- "tensorchord/envd-from-scratch:v{{ .Version }}-arm64v8"
97-
use: buildx
98-
goarch: arm64
99-
ids:
100-
- envd
101-
dockerfile: base-images/envd/envd.Dockerfile
102-
build_flag_templates:
103-
- "--platform=linux/arm64/v8"
104-
- image_templates:
105-
- "tensorchord/envd-sshd-from-scratch:v{{ .Version }}-amd64"
106-
use: buildx
107-
dockerfile: base-images/envd-sshd/envd-sshd.Dockerfile
108-
ids:
109-
- envd-sshd
110-
build_flag_templates:
111-
- "--platform=linux/amd64"
112-
- image_templates:
113-
- "tensorchord/envd-sshd-from-scratch:v{{ .Version }}-arm64v8"
114-
use: buildx
115-
goarch: arm64
116-
ids:
117-
- envd-sshd
91+
ids: ["envd"]
92+
tags:
93+
- "v{{ .Version }}"
94+
platforms:
95+
- linux/amd64
96+
- linux/arm64/v8
97+
- id: "envd-sshd"
98+
images:
99+
- "tensorchord/envd-sshd-from-scratch"
118100
dockerfile: base-images/envd-sshd/envd-sshd.Dockerfile
119-
build_flag_templates:
120-
- "--platform=linux/arm64/v8"
121-
docker_manifests:
122-
- name_template: tensorchord/envd-sshd-from-scratch:v{{ .Version }}
123-
image_templates:
124-
- tensorchord/envd-sshd-from-scratch:v{{ .Version }}-amd64
125-
- tensorchord/envd-sshd-from-scratch:v{{ .Version }}-arm64v8
126-
- name_template: tensorchord/envd-from-scratch:v{{ .Version }}
127-
image_templates:
128-
- tensorchord/envd-from-scratch:v{{ .Version }}-amd64
129-
- tensorchord/envd-from-scratch:v{{ .Version }}-arm64v8
101+
ids: ["envd-sshd"]
102+
tags:
103+
- "v{{ .Version }}"
104+
platforms:
105+
- linux/amd64
106+
- linux/arm64/v8
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FROM scratch
2-
COPY envd-sshd /usr/bin/envd-sshd
2+
ARG TARGETPLATFORM
3+
COPY $TARGETPLATFORM/envd-sshd /usr/bin/envd-sshd

base-images/envd/envd.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FROM scratch
2-
COPY envd /usr/bin/envd
2+
ARG TARGETPLATFORM
3+
COPY $TARGETPLATFORM/envd /usr/bin/envd

0 commit comments

Comments
 (0)