Merge branch 'ethereum:main' into mkeil/bundle-trusted-setup

matthewkeil · Apr 30, 2024 · 37e8dd6 · 37e8dd6
2 parents ff508fa + 58b09bd
commit 37e8dd6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/csharp-tests.yml b/.github/workflows/csharp-tests.yml
@@ -71,7 +71,7 @@ jobs:
           - host: ubuntu-22.04
             location: linux-x64
           - host: macos-latest
-            location: osx-x64
+            location: osx-arm64
           - host: windows-latest
             location: win-x64
     steps:

diff --git a/.github/workflows/nodejs-tests.yml b/.github/workflows/nodejs-tests.yml
@@ -27,8 +27,14 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{matrix.node}}
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Install setuptools
-        run: python3 -m pip install setuptools
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools
       - name: Check formatting
         if: matrix.os == 'ubuntu-latest'
         working-directory: bindings/node.js