Skip to content

Commit 5cf6f5b

Browse files
authored
Merge branch 'main' into patch-1
2 parents e64216e + 7d9b2c7 commit 5cf6f5b

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
# Use Ubuntu 20.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
68-
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'pi' ] # macOS 14 runner exclusively runs on M1 hardwares
69-
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
68+
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'ubuntu-22.04-arm' ] # macOS 14 runner exclusively runs on M1 hardwares
69+
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
7070
python_version: [ '3.10' ]
7171
runs-on: ${{ matrix.os }}
7272
steps:
@@ -132,7 +132,7 @@ jobs:
132132
strategy:
133133
fail-fast: false
134134
matrix:
135-
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'windows-2022', 'pi' ]
135+
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'windows-2022', 'ubuntu-22.04-arm' ]
136136
python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13' ]
137137
runs-on: ${{ matrix.os }}
138138
steps:
@@ -144,9 +144,6 @@ jobs:
144144
- uses: actions/setup-python@v5
145145
with:
146146
python-version: ${{ matrix.python_version }}
147-
- name: Remove old poetry cache
148-
run: rm -rf ~/.cache/pypoetry
149-
if: ${{ matrix.os == 'pi' }}
150147
- name: Setup Poetry
151148
uses: snok/install-poetry@v1
152149
with:

.github/workflows/update-mozcentral-version.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: 'Create pull requests to update mozilla-central version to the latest'
22

33
on:
4-
schedule:
5-
- cron: "00 14 */100,1-7 * 1" # run on the first Monday of each month at 14:00 UTC (10:00 Eastern Daylight Time)
4+
# schedule:
5+
# - cron: "00 14 */100,1-7 * 1" # run on the first Monday of each month at 14:00 UTC (10:00 Eastern Daylight Time)
66
# See https://blog.healthchecks.io/2022/09/schedule-cron-job-the-funky-way/
77
workflow_call:
88
workflow_dispatch: # or you can run it manually
@@ -21,7 +21,7 @@ jobs:
2121
# See https://mozilla-version-control-tools.readthedocs.io/en/latest/hgmo/pushlog.html#hgweb-commands
2222
run: |
2323
COMMIT_HASH=$(
24-
curl -s "https://hg.mozilla.org/mozilla-central/json-pushes?tipsonly=1&version=2" |\
24+
curl -L -s "https://hg.mozilla.org/mozilla-central/json-pushes?tipsonly=1&version=2" |\
2525
jq --join-output '(.lastpushid | tostring) as $pushid | empty, .pushes[$pushid].changesets[0]'
2626
)
2727
echo "MOZCENTRAL_VERSION=$COMMIT_HASH" >> $GITHUB_ENV

mozcentral.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dd8b1488a379ee395592f636d084cf81117f3b4c
1+
cdfe9f2e144a04618cb6e9ffd9e6202d6d85ed56

setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ echo "Done installing dependencies"
4444
echo "Downloading spidermonkey source code"
4545
# Read the commit hash for mozilla-central from the `mozcentral.version` file
4646
MOZCENTRAL_VERSION=$(cat mozcentral.version)
47-
wget -c -q -O firefox-source-${MOZCENTRAL_VERSION}.zip https://hg.mozilla.org/mozilla-central/archive/${MOZCENTRAL_VERSION}.zip
48-
unzip -q firefox-source-${MOZCENTRAL_VERSION}.zip && mv mozilla-central-${MOZCENTRAL_VERSION} firefox-source
47+
wget -c -q -O firefox-source-${MOZCENTRAL_VERSION}.zip https://github.com/mozilla/gecko-dev/archive/${MOZCENTRAL_VERSION}.zip
48+
unzip -q firefox-source-${MOZCENTRAL_VERSION}.zip && mv gecko-dev-${MOZCENTRAL_VERSION} firefox-source
4949
echo "Done downloading spidermonkey source code"
5050

5151
echo "Building spidermonkey"

0 commit comments

Comments
 (0)