Merge branch 'main' into chore/upgrade-spidermonkey-to-e571552

Author: Xmader

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

@@ -65,8 +65,8 @@ jobs:
       fail-fast: false
       matrix:
         # Use Ubuntu 20.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
-        os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'pi' ] # macOS 14 runner exclusively runs on M1 hardwares
-                                                             # see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
+        os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'ubuntu-22.04-arm' ] # macOS 14 runner exclusively runs on M1 hardwares
+                                                                           # see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
         python_version: [ '3.10' ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -132,7 +132,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'windows-2022', 'pi' ]
+        os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'windows-2022', 'ubuntu-22.04-arm' ]
         python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13' ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -144,9 +144,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
-      - name: Remove old poetry cache
-        run: rm -rf ~/.cache/pypoetry
-        if: ${{ matrix.os == 'pi' }}
       - name: Setup Poetry
         uses: snok/install-poetry@v1
         with:
@@ -180,7 +177,7 @@ jobs:
             BUILD_DOCS=1 BUILD_TYPE=None poetry install
       - name: Upload Doxygen-generated docs as CI artifacts
         if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python_version == '3.11' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs-${{ github.run_id }}-${{ github.sha }}
           path: ./build/docs/html/
@@ -218,9 +215,9 @@ jobs:
             mv "$file" "$(echo "$file" | sed -E 's/macosx_[0-9]+_[0-9]+/macosx_11_0/')";
           done
       - name: Upload wheel as CI artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          name: wheel-${{ github.run_id }}-${{ github.sha }}-${{ runner.os }}_${{ runner.arch }}_Python${{ matrix.python_version }}
           path: ./dist/
       - name: Set cores to get stored in /cores
         if: ${{ matrix.os != 'windows-2022' }}
@@ -257,7 +254,7 @@ jobs:
         with:
           credentials: "admin:admin"
       - name: Upload core dumps as CI artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.os != 'windows-2022' && failure() }}
         # TODO (Caleb Aikens) figure out how to get Windows core dumps
         with:
@@ -282,9 +279,9 @@ jobs:
           poetry build --format=sdist
           ls -lah ./dist/
       - name: Upload sdist as CI artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          name: wheel-${{ github.run_id }}-${{ github.sha }}-sdist
           path: ./dist/
   check-install-from-sdist:
     needs: sdist
@@ -294,9 +291,9 @@ jobs:
         with:
           python-version: '3.10'
       - name: Download wheels built
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          name: wheel-${{ github.run_id }}-${{ github.sha }}-sdist
           path: ./dist/
       - run: pip install ./dist/pythonmonkey-*.tar.gz
   publish:
@@ -310,9 +307,10 @@ jobs:
           python-version: '3.9'
       - run: pip install twine
       - name: Download wheels built
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
+          merge-multiple: true
           path: ./dist/
       - run: ls -lah ./dist/
       - name: Publish package
@@ -335,12 +333,13 @@ jobs:
     steps:
       # don't checkout
       - name: Download wheels built
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
+          merge-multiple: true
           path: ./dist/
       - name: Download docs html generated by Doxygen
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docs-${{ github.run_id }}-${{ github.sha }}
           path: ./docs/
@@ -374,12 +373,12 @@ jobs:
           html+="<li><a href="pminit/">pminit</a></li>"
           html+="</body></html>"
           echo "$html" > ./index.html
-      - uses: actions/upload-pages-artifact@v1
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: ./
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
   publish-archive:
     # Publish to ⊇istributive's archive server (https://archive.distributed.computer/releases/pythonmonkey/)
     needs: [build-and-test, sdist]
@@ -391,12 +390,13 @@ jobs:
     steps:
       # no need to checkout
       - name: Download wheels built
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
+          merge-multiple: true
           path: ./
       - name: Download docs html generated by Doxygen
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docs-${{ github.run_id }}-${{ github.sha }}
           path: ./docs/

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

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

mozcentral.version

@@ -1 +1 @@
-e571552c235724fbce9b1ceaedf4bff73093eaa7
+cdfe9f2e144a04618cb6e9ffd9e6202d6d85ed56