Merge pull request #1997 from larrybradley/free-arm

Use the free ARM64 test runner
astropy · Jan 22, 2025 · 88a65cb · 88a65cb
2 parents 9eb6129 + e3f8c1b
commit 88a65cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/.github/workflows/ci_cron_daily.yml b/.github/workflows/ci_cron_daily.yml
@@ -66,7 +66,7 @@ jobs:
         python -c "import setuptools; print(f'setuptools {setuptools.__version__}')"
         python -c "import tox; print(f'tox {tox.__version__}')"
     - name: Run tests
-      run: tox -e ${{ matrix.tox_env }} -- ${{ matrix.toxposargs }}
+      run: python -m tox -e ${{ matrix.tox_env }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: ${{ contains(matrix.tox_env, '-cov') }}
       uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e  # v5.1.1

diff --git a/.github/workflows/ci_cron_weekly.yml b/.github/workflows/ci_cron_weekly.yml
@@ -59,7 +59,7 @@ jobs:
           python -c "import setuptools; print(f'setuptools {setuptools.__version__}')"
           python -c "import tox; print(f'tox {tox.__version__}')"
       - name: Run tests
-        run: tox -e ${{ matrix.tox_env }} -- ${{ matrix.toxposargs }}
+        run: python -m tox -e ${{ matrix.tox_env }} -- ${{ matrix.toxposargs }}
 
 
   test_more_architectures:
@@ -128,24 +128,3 @@ jobs:
             ASTROPY_USE_SYSTEM_ALL=1 pip3 install -v --no-build-isolation -e .[test]
             pip3 list
             python3 -m pytest
-
-
-  test_arm64:
-    # Native arm64 testing -- paid test runner
-    # keep this in the weekly cron to minimize the number of jobs
-    runs-on: linux-arm64
-    name: Python 3.12 (arm64)
-    # keep condition in sync with test_more_architectures
-    if: (github.repository == 'astropy/photutils' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'Arch CI')))
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
-        with:
-          python-version: '3.12'
-      - name: Set up dependencies
-        run: pip install tox
-      - name: Run tests
-        run: tox -e py312-test -- -n=2
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -74,6 +74,13 @@ jobs:
             allow_failure: false
             prefix: ''
 
+          - os: ubuntu-24.04-arm
+            python: '3.12'
+            tox_env: 'py312-test'
+            toxposargs: --remote-data=any
+            allow_failure: false
+            prefix: ''
+
           - os: ubuntu-latest
             python: '3.12'
             tox_env: 'codestyle'
@@ -124,7 +131,7 @@ jobs:
         python -c "import setuptools; print(f'setuptools {setuptools.__version__}')"
         python -c "import tox; print(f'tox {tox.__version__}')"
     - name: Run tests
-      run: tox -e ${{ matrix.tox_env }} -- ${{ matrix.toxposargs }}
+      run: python -m tox -e ${{ matrix.tox_env }} -- -n=2 ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: ${{ contains(matrix.tox_env, '-cov') }}
       uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e  # v5.1.1