Skip to content

Commit cd58e66

Browse files
authored
Merge pull request #11 from jnises/release-update
mac release fixes
2 parents 78f824c + dc0fc83 commit cd58e66

File tree

1 file changed

+5
-29
lines changed

1 file changed

+5
-29
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
path: git-suggest-reviewers_win_x64.exe
3131

3232
mac_build:
33-
runs-on: macos-13
33+
runs-on: macos-14
3434
steps:
3535
- uses: actions/checkout@v4
3636
- uses: actions/cache@v4
@@ -43,26 +43,13 @@ jobs:
4343
target/
4444
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4545
- uses: dtolnay/rust-toolchain@stable
46-
with:
47-
targets: aarch64-apple-darwin, x86_64-apple-darwin
48-
- name: Build x86_64
49-
run: |
50-
cargo build --release --target x86_64-apple-darwin
51-
ARTIFACT="target/x86_64-apple-darwin/release/git-suggest-reviewers"
52-
strip -S "$ARTIFACT"
53-
ditto -c -k --sequesterRsrc "$ARTIFACT" git-suggest-reviewers_mac_x64.zip
54-
- uses: actions/upload-artifact@v4
55-
with:
56-
name: git-suggest-reviewers_mac_x64.zip
57-
path: git-suggest-reviewers_mac_x64.zip
5846
- name: Build aarch64
59-
# getting sdk using xcrun to cross compile. is this still needed these days?
6047
run: |
61-
SDKROOT=$(xcrun -sdk macosx12.3 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo build --release --target aarch64-apple-darwin
48+
cargo build --release --target aarch64-apple-darwin
6249
ARTIFACT="target/aarch64-apple-darwin/release/git-suggest-reviewers"
6350
strip -S "$ARTIFACT"
6451
ditto -c -k --sequesterRsrc "$ARTIFACT" git-suggest-reviewers_mac_aarch64.zip
65-
- uses: actions/upload-artifact@v3
52+
- uses: actions/upload-artifact@v4
6653
with:
6754
name: git-suggest-reviewers_mac_aarch64.zip
6855
path: git-suggest-reviewers_mac_aarch64.zip
@@ -71,13 +58,10 @@ jobs:
7158
needs: [win_build, mac_build]
7259
runs-on: ubuntu-latest
7360
steps:
74-
- uses: actions/download-artifact@v3
75-
with:
76-
name: git-suggest-reviewers_mac_x64.zip
77-
- uses: actions/download-artifact@v3
61+
- uses: actions/download-artifact@v4
7862
with:
7963
name: git-suggest-reviewers_mac_aarch64.zip
80-
- uses: actions/download-artifact@v3
64+
- uses: actions/download-artifact@v4
8165
with:
8266
name: git-suggest-reviewers_win_x64.exe
8367
# zip the win build here.
@@ -94,14 +78,6 @@ jobs:
9478
release_name: Release ${{ github.ref }}
9579
draft: false
9680
prerelease: false
97-
- uses: actions/upload-release-asset@v1
98-
env:
99-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100-
with:
101-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
102-
asset_path: ./git-suggest-reviewers_mac_x64.zip
103-
asset_name: git-suggest-reviewers_mac_x64.zip
104-
asset_content_type: application/zip
10581
- uses: actions/upload-release-asset@v1
10682
env:
10783
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)