Skip to content

Commit 203c232

Browse files
committed
Rename mac to mac-arm64, adjust for Silicon build, remove sccache code (why was that useful?).
1 parent b88342c commit 203c232

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
name: Mac
1+
name: Mac-arm64
22

33
on:
44
# Manual run
55
workflow_dispatch:
66
inputs:
77
version:
8-
default: "102"
8+
default: "140"
99
required: true
1010
type: choice
11-
options: ["102", "115"]
11+
options: ["140"]
1212
# Run on tag push
1313
push:
1414
tags: '[0-9][0-9][0-9].*-automation'
1515

1616
env:
17-
SCCACHE_GHA_ENABLED: "true"
18-
CCACHE: "sccache"
1917
VERSION: "${{ inputs.version && inputs.version || github.ref_name }}"
2018

2119
jobs:
2220
build:
23-
runs-on: macos-latest
21+
runs-on: macos-14-arm64 # Apple Silicon runner
2422

2523
steps:
2624
- name: Checkout
@@ -34,9 +32,6 @@ jobs:
3432
source ${{ env.VER }}/${{ env.VER }}.sh
3533
rustup override set $RUST_VER
3634
brew install gnu-sed mercurial
37-
echo "ac_add_options --with-ccache=sccache" >> ${{ env.VER }}/mozconfig-Mac
38-
- name: Use sccache-cache
39-
uses: mozilla-actions/sccache-action@v0.0.3
4035
- name: build
4136
working-directory: ".."
4237
run: |
@@ -47,4 +42,4 @@ jobs:
4742
uses: actions/upload-artifact@v3
4843
with:
4944
name: mac-${{ env.VER }}
50-
path: "/Users/runner/work/thunderbird-patches/mozilla-esr${{ env.VER }}/obj-x86_64-apple-darwin/dist/*.mac.dmg"
45+
path: "/Users/runner/work/thunderbird-patches/mozilla-esr${{ env.VER }}/obj-aarch64-apple-darwin/dist/*.mac.dmg"

0 commit comments

Comments
 (0)