Skip to content

Commit 0156831

Browse files
author
bay
committed
Revert "Build for MacOS Arm/x86"
This reverts commit ac44a3b.
1 parent d4a28db commit 0156831

File tree

7 files changed

+83
-57
lines changed

7 files changed

+83
-57
lines changed

‎.ci/release.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@ steps:
55
- script: './build_static_linux.sh'
66
displayName: Build Linux Release
77
condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ))
8-
# macOS Intel Release Build
98
- script: './build_static.sh'
10-
displayName: Build MacOS Release (Intel)
11-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['Agent.OSArchitecture'], 'X64'))
12-
# macOS ARM Release Build
13-
- script: './build_static_arm.sh'
14-
displayName: Build MacOS Release (ARM)
15-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['Agent.OSArchitecture'], 'ARM64'), 'arm64'))
9+
displayName: Build MacOS Release
10+
condition: and(succeeded(), eq( variables['Agent.OS'], 'Darwin' ))
1611
- script: |
1712
MY_TAG="$(Build.SourceBranch)"
1813
MY_TAG=${MY_TAG#refs/tags/}

‎.ci/test.yml

-12
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ steps:
66
ROARING_ARCH: x86-64-v2
77
displayName: Windows Cargo Test
88
condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), eq( variables['CI_JOB'], 'test-all' ))
9-
# macOS for x86
10-
- script: |
11-
rustup target add x86_64-apple-darwin
12-
ROARING_ARCH=x86-64-v2 cargo test --all --target x86_64-apple-darwin
13-
displayName: macOS Cargo Test (x86_64)
14-
condition: and(eq(variables['Agent.OS'], 'Darwin'), eq(variables['Agent.OSArchitecture'], 'X64'), eq(variables['CI_JOB'], 'test-all'))
15-
# macOS for arm64
16-
- script: |
17-
rustup target add aarch64-apple-darwin
18-
ROARING_ARCH=aarch64 cargo test --all --target aarch64-apple-darwin
19-
displayName: macOS Cargo Test (ARM64)
20-
condition: and(eq(variables['Agent.OS'], 'Darwin'), eq(variables['Agent.OSArchitecture'], 'ARM64'), eq(variables['CI_JOB'], 'test-all'))
219
- script: 'ROARING_ARCH=x86-64-v2 cargo test --all'
2210
displayName: macOS Cargo Test
2311
condition: and(eq( variables['Agent.OS'], 'Darwin' ), eq( variables['CI_JOB'], 'test-all' ))

‎.github/workflows/cd.yaml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Continuous Deployment
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
8+
jobs:
9+
linux-release:
10+
name: Linux Release
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Build
15+
run: cargo build --release
16+
- name: Archive
17+
working-directory: target/release
18+
run: tar -czvf grin-${{ github.ref_name }}-linux-x86_64.tar.gz grin
19+
- name: Create Checksum
20+
working-directory: target/release
21+
run: openssl sha256 grin-${{ github.ref_name }}-linux-x86_64.tar.gz > grin-${{ github.ref_name }}-linux-x86_64-sha256sum.txt
22+
- name: Release
23+
uses: softprops/action-gh-release@v1
24+
with:
25+
generate_release_notes: true
26+
files: |
27+
target/release/grin-${{ github.ref_name }}-linux-x86_64.tar.gz
28+
target/release/grin-${{ github.ref_name }}-linux-x86_64-sha256sum.txt
29+
30+
macos-release:
31+
name: macOS Release
32+
runs-on: macos-latest
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v3
36+
- name: Build
37+
run: cargo build --release
38+
- name: Archive
39+
working-directory: target/release
40+
run: tar -czvf grin-${{ github.ref_name }}-macos-x86_64.tar.gz grin
41+
- name: Create Checksum
42+
working-directory: target/release
43+
run: openssl sha256 grin-${{ github.ref_name }}-macos-x86_64.tar.gz > grin-${{ github.ref_name }}-macos-x86_64-sha256sum.txt
44+
- name: Release
45+
uses: softprops/action-gh-release@v1
46+
with:
47+
files: |
48+
target/release/grin-${{ github.ref_name }}-macos-x86_64.tar.gz
49+
target/release/grin-${{ github.ref_name }}-macos-x86_64-sha256sum.txt
50+
51+
windows-release:
52+
name: Windows Release
53+
runs-on: windows-2019
54+
env:
55+
ROARING_ARCH: x86-64-v2
56+
steps:
57+
- name: Checkout
58+
uses: actions/checkout@v3
59+
- name: Build
60+
run: cargo build --release
61+
- name: Archive
62+
uses: vimtor/action-zip@v1
63+
with:
64+
files: target/release/grin.exe
65+
dest: target/release/grin-${{ github.ref_name }}-win-x86_64.zip
66+
- name: Create Checksum
67+
working-directory: target/release
68+
shell: pwsh
69+
run: get-filehash -algorithm sha256 grin-${{ github.ref_name }}-win-x86_64.zip | Format-List |  Out-String | ForEach-Object { $_.Trim() } > grin-${{ github.ref_name }}-win-x86_64-sha256sum.txt
70+
- name: Release
71+
uses: softprops/action-gh-release@v1
72+
with:
73+
files: |
74+
target/release/grin-${{ github.ref_name }}-win-x86_64.zip
75+
target/release/grin-${{ github.ref_name }}-win-x86_64-sha256sum.txt

‎.github/workflows/ci.yaml

+2-11
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,15 @@ jobs:
1414
working-directory: ${{ matrix.job_args }}
1515
run: cargo test --release
1616

17-
macos-intel-tests:
17+
macos-tests:
1818
name: macOS Tests
1919
runs-on: macos-latest
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v3
23-
- name: Tests (Intel)
23+
- name: Tests
2424
run: cargo test --release --all
2525

26-
macos-arm-tests:
27-
name: macOS Tests
28-
runs-on: macos-latest
29-
steps:
30-
- name: Checkout
31-
uses: actions/checkout@v3
32-
- name: Tests (ARM64)
33-
run: cargo test --release --all --target aarch64-apple-darwin
34-
3526
windows-tests:
3627
name: Windows Tests
3728
runs-on: windows-2019

‎azure-pipelines.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,11 @@ jobs:
6666
vmImage: macos-latest
6767
strategy:
6868
matrix:
69-
x86_64:
70-
CI_JOB: test-all
71-
TARGET: x86_64-apple-darwin
72-
arm64:
69+
test:
7370
CI_JOB: test-all
74-
TARGET: aarch64-apple-darwin
75-
release_x86_64:
76-
CI_JOB: release
77-
PLATFORM: macos-x86_64
78-
TARGET: x86_64-apple-darwin
79-
release_arm64:
71+
release:
8072
CI_JOB: release
81-
PLATFORM: macos-arm64
82-
TARGET: aarch64-apple-darwin
73+
PLATFORM: macos
8374
steps:
8475
- template: '.ci/test.yml'
8576
- template: '.ci/release.yml'

‎build_static.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ export OPENSSL_STATIC=yes
77

88
ROARING_ARCH=x86-64-v2
99

10-
rustup target add x86_64-apple-darwin
11-
12-
cargo build --release --target x86_64-apple-darwin
10+
cargo build --release

‎build_static_arm.sh

-12
This file was deleted.

0 commit comments

Comments
 (0)