Skip to content

Commit b851b42

Browse files
committed
2.x: Added support for Darwin arm64
1 parent bfcc6bc commit b851b42

File tree

3 files changed

+45
-3
lines changed

3 files changed

+45
-3
lines changed

.github/workflows/ce-dev-build-2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run: yarn
1919
# Uses https://oclif.io/
2020
- name: Pack the JS
21-
run: yarn oclif pack tarballs --targets=linux-arm,linux-x64,darwin-x64 --no-xz
21+
run: yarn oclif pack tarballs --targets=linux-x64,linux-arm,linux-arm64,win32-x64,win32-x86,darwin-x64,darwin-arm64 --no-xz
2222
- name: Rename the dist/* files
2323
run: yarn renamedist
2424
# We build mkcert from source because releases are broken

.github/workflows/ce-dev-pr-temp-2.yml renamed to .github/workflows/ce-dev-test-linux-2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: '2.x: Temporal workflow to test'
1+
name: '2.x: Linux - Build ce_dev binaries, images and templates (test)'
22

33
on:
44
push:
@@ -17,7 +17,7 @@ jobs:
1717
# Uses https://oclif.io/
1818
# Not strictly necessary here, but ensures the packing works
1919
- name: Pack the JS
20-
run: yarn oclif pack tarballs --targets=linux-arm,linux-x64,darwin-x64 --no-xz
20+
run: yarn oclif pack tarballs --targets=linux-x64,linux-arm,linux-arm64 --no-xz
2121
- name: Rename the dist/* files
2222
run: yarn renamedist
2323
# We build mkcert from source because releases are broken
+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: '2.x: MacOS - Build ce_dev binaries, images and templates (test)'
2+
3+
on:
4+
push:
5+
branches:
6+
- 2.x-devel
7+
8+
jobs:
9+
build:
10+
runs-on: macos-14
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
ref: '2.x-devel'
15+
- name: Install modules
16+
run: yarn
17+
# Uses https://oclif.io/
18+
# Not strictly necessary here, but ensures the packing works
19+
- name: Pack the JS
20+
run: yarn oclif pack tarballs --targets=darwin-x64,darwin-arm64 --no-xz
21+
- name: Rename the dist/* files
22+
run: yarn renamedist
23+
# We build mkcert from source because releases are broken
24+
- name: Install test dependencies
25+
run: |
26+
sudo apt-get update
27+
sudo apt-get install -y p7zip-full libnss3-tools wget
28+
cd /tmp
29+
wget https://go.dev/dl/go1.22.1.darwin-arm64.tar.gz
30+
sudo tar -C /usr/local -xzf go1.22.1.darwin-arm64.tar.gz
31+
export PATH=$PATH:/usr/local/go/bin
32+
git clone https://github.com/FiloSottile/mkcert && cd mkcert
33+
go build -ldflags "-X main.Version=$(git describe --tags)"
34+
sudo mv ./mkcert /usr/local/bin && cd ../
35+
sudo chmod +x /usr/local/bin/mkcert
36+
rm -Rf mkcert
37+
- name: Build and test
38+
run: |
39+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
40+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
41+
sudo chmod +x bin/run.js
42+
/bin/sh templates/prebuild.sh

0 commit comments

Comments
 (0)