Skip to content

Commit 2479b9c

Browse files
committed
Update all Github CI runners
1 parent ebe762f commit 2479b9c

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

.github/workflows/citest.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ jobs:
1616
strategy:
1717
matrix:
1818
include:
19-
- name: Ubuntu 22.04 (Python-3.10), native
20-
os: ubuntu-22.04
19+
- name: Ubuntu 24.04 (Python-3.12.3), native
20+
os: ubuntu-24.04
2121
method: native
2222
iraf: /usr/lib/iraf/
2323
upload_coverage: yes
2424

25-
- name: Ubuntu 22.04 (Python-3.10), native, without IRAF
26-
os: ubuntu-22.04
25+
- name: Ubuntu 24.04 (Python-3.12.3), native, without IRAF
26+
os: ubuntu-24.04
2727
method: native
2828

29-
- name: Ubuntu 20.04 (Python-3.8.2), pip
30-
os: ubuntu-20.04
29+
- name: Ubuntu 22.04 (Python-3.10), pip
30+
os: ubuntu-22.04
3131
method: pip
3232
iraf: /usr/lib/iraf/
3333

34-
- name: macOS 13, pip
35-
os: macos-13
34+
- name: macOS 15, pip
35+
os: macos-15
3636
method: pip
3737
iraf: /Users/runner/work/iraf/
3838

@@ -59,15 +59,15 @@ jobs:
5959
run: |
6060
sudo apt-get update
6161
sudo apt-get install --no-install-recommends iraf iraf-noao iraf-dev build-essential libx11-dev
62-
sudo apt-get install --no-install-recommends python3-dev python3-pip
62+
sudo apt-get install --no-install-recommends python3-dev python3-pip python3-venv
6363
pip3 install ipython
6464
6565
- name: Setup dependencies, Mac
6666
if: startsWith(matrix.os, 'macos') && matrix.method == 'pip'
6767
run: |
6868
mkdir $iraf
6969
curl https://cloud.aip.de/index.php/s/iPj7LGxbRedYnqa/download/iraf-macintel.tar.gz | tar -C $iraf -x -z
70-
(cd $iraf ; ./install < /dev/null || true)
70+
(cd $iraf ; IRAFARCH=macintel ./install < /dev/null || true)
7171
export PATH=${HOME}/.iraf/bin:${PATH}
7272
mkiraf -t=$TERM -n
7373
echo "PATH=$PATH" >> $GITHUB_ENV
@@ -80,7 +80,9 @@ jobs:
8080
- name: Install PyRAF via pip
8181
if: matrix.method == 'pip'
8282
run: |
83-
pip3 install git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_SHA#egg=pyraf[test]
83+
python3 -m venv /tmp/pyraf-venv
84+
source /tmp/pyraf-venv/bin/activate
85+
python3 -m pip install pytest git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_SHA#egg=pyraf[test]
8486
8587
- name: Run tests (locally built)
8688
if: matrix.method == 'native'
@@ -90,6 +92,7 @@ jobs:
9092
- name: Run tests (installed package)
9193
if: matrix.method == 'pip'
9294
run: |
95+
source /tmp/pyraf-venv/bin/activate
9396
python3 -m pytest -s --pyargs pyraf
9497
9598
- name: "Upload coverage to Codecov"

0 commit comments

Comments
 (0)