Skip to content

Commit d42de0c

Browse files
pllimpllim
committed
TST: No more 32-bit CI job.
TST: Update Action uses versions, where applicable. TST: Minor workflow clean-ups.
1 parent 691ceab commit d42de0c

6 files changed

Lines changed: 43 additions & 38 deletions

File tree

‎.github/workflows/ci_cron_daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout code
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444
with:
4545
fetch-depth: 0
4646
- name: Set up Python
47-
uses: actions/setup-python@v2
47+
uses: actions/setup-python@v3
4848
with:
4949
python-version: ${{ matrix.python }}
5050
- name: Install language-pack-de and tzdata

‎.github/workflows/ci_cron_weekly.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ jobs:
5858

5959
steps:
6060
- name: Checkout code
61-
uses: actions/checkout@v2
61+
uses: actions/checkout@v3
6262
with:
6363
fetch-depth: 0
6464
- name: Set up Python
65-
uses: actions/setup-python@v2
65+
uses: actions/setup-python@v3
6666
with:
6767
python-version: ${{ matrix.python }}
6868
- name: Install language-pack-de and tzdata
@@ -101,7 +101,7 @@ jobs:
101101
#- arch: ppc64le
102102

103103
steps:
104-
- uses: actions/checkout@v2
104+
- uses: actions/checkout@v3
105105
with:
106106
fetch-depth: 0
107107
- uses: uraimo/run-on-arch-action@v2.1.1

‎.github/workflows/ci_workflows.yml‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Check base branch
21-
uses: actions/github-script@v3
21+
uses: actions/github-script@v6
2222
if: github.event_name == 'pull_request'
2323
with:
2424
script: |
@@ -91,20 +91,23 @@ jobs:
9191

9292
steps:
9393
- name: Checkout code
94-
uses: actions/checkout@v2
94+
uses: actions/checkout@v3
9595
with:
9696
fetch-depth: 0
9797
- name: Set up Python
98-
uses: actions/setup-python@v2
98+
uses: actions/setup-python@v3
9999
with:
100100
python-version: ${{ matrix.python }}
101101
- name: Install language-pack-fr and tzdata
102102
if: startsWith(matrix.os, 'ubuntu')
103103
run: |
104104
sudo apt-get update
105105
sudo apt-get install language-pack-fr tzdata
106-
- name: Install Python dependencies
107-
run: python -m pip install --upgrade tox codecov
106+
- name: Install tox
107+
run: python -m pip install --upgrade tox
108+
- name: Install codecov
109+
if: ${{ contains(matrix.toxenv,'-cov') }}
110+
run: python -m pip install codecov
108111
- name: Run tests
109112
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
110113
# TODO: Do we need --gcov-glob "*cextern*" ?
@@ -130,11 +133,11 @@ jobs:
130133

131134
steps:
132135
- name: Checkout code
133-
uses: actions/checkout@v2
136+
uses: actions/checkout@v3
134137
with:
135138
fetch-depth: 0
136139
- name: Set up Python
137-
uses: actions/setup-python@v2
140+
uses: actions/setup-python@v3
138141
with:
139142
python-version: ${{ matrix.python }}
140143
- name: Install language-pack-de and tzdata
@@ -143,39 +146,41 @@ jobs:
143146
sudo apt-get update
144147
sudo apt-get install language-pack-de tzdata
145148
- name: Install Python dependencies
146-
run: python -m pip install --upgrade tox codecov
149+
run: python -m pip install --upgrade tox
147150
- name: Run tests
148151
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
149152

150-
parallel_and_32bit:
151-
name: 32-bit and parallel
153+
parallel-double:
154+
name: Parallel and double
152155
runs-on: ubuntu-latest
153156
needs: initial_checks
154-
container:
155-
image: quay.io/pypa/manylinux2014_i686
156157
steps:
157-
# TODO: Use newer checkout actions when https://github.com/actions/checkout/issues/334 fixed
158158
- name: Checkout code
159-
uses: actions/checkout@v1
159+
uses: actions/checkout@v3
160160
with:
161161
fetch-depth: 0
162+
- name: Set up Python
163+
uses: actions/setup-python@v3
164+
with:
165+
python-version: 3.8
166+
- name: Install language-pack-de and tzdata
167+
run: |
168+
sudo apt-get update
169+
sudo apt-get install language-pack-de tzdata
170+
- name: Install Python dependencies
171+
run: python -m pip install --upgrade tox
162172
- name: Write configuration items to standard location to make sure they are ignored in parallel mode
163173
run: |
164174
mkdir -p $HOME/.astropy/config/
165175
printf "unicode_output = True\nmax_width = 500" > $HOME/.astropy/config/astropy.cfg
166-
# In addition to testing 32-bit, we also use the 3.8 builds to
167-
# test the ability to run the test suite in parallel.
168-
# Numpy is pinned to avoid building it from source for numpy 1.21.5
169-
- name: Install dependencies for Python 3.8
170-
run: /opt/python/cp38-cp38/bin/pip install tox
171-
- name: Run tests for Python 3.8
172-
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy120-test -- -n=4 --durations=50
173-
# We use the 3.8 build to check that running tests twice in a row in the
176+
# We test the ability to run the test suite in parallel.
177+
- name: Run parallel tests
178+
run: tox -e py38-test -- -n=4 --durations=50
179+
# We check that running tests twice in a row in the
174180
# same Python session works without issues. This catches cases where
175181
# running the tests changes the module state permanently. Note that we
176182
# shouldn't also test the parallel build here since that enforces a degree
177183
# of isolation of tests which will interfere with what we are trying to do
178184
# here.
179-
# Numpy is pinned to avoid building it from source for numpy 1.21.5
180-
- name: Run tests for Python 3.8
181-
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy120-test-double
185+
- name: Run double tests
186+
run: tox -e py38-test-double

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v3
3535
with:
3636
fetch-depth: 0
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v1
40+
uses: github/codeql-action/init@v2
4141
with:
4242
languages: ${{ matrix.language }}
4343
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,7 +49,7 @@ jobs:
4949
# If this step fails, then you should remove it and run the build manually (see below)
5050
- name: Autobuild
5151
if: matrix.language != 'cpp'
52-
uses: github/codeql-action/autobuild@v1
52+
uses: github/codeql-action/autobuild@v2
5353

5454
# ℹ️ Command-line programs to run using the OS shell.
5555
# 📚 https://git.io/JvXDl
@@ -59,7 +59,7 @@ jobs:
5959
# uses a compiled language
6060

6161
- name: Set up Python
62-
uses: actions/setup-python@v2
62+
uses: actions/setup-python@v3
6363
if: matrix.language == 'cpp'
6464
with:
6565
python-version: 3.9
@@ -72,4 +72,4 @@ jobs:
7272
python setup.py build_ext --inplace
7373
7474
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@v1
75+
uses: github/codeql-action/analyze@v2

‎.github/workflows/open_actions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# NOTE: sync-labels due to https://github.com/actions/labeler/issues/112
1616
- name: Label PR
17-
uses: actions/labeler@v3
17+
uses: actions/labeler@v4
1818
if: github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'meeseeksmachine'
1919
with:
2020
repo-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -69,7 +69,7 @@ jobs:
6969
please send an e-mail directly to the private e-mail
7070
feedback@astropy.org.
7171
- name: 'Comment Draft PR'
72-
uses: actions/github-script@v3
72+
uses: actions/github-script@v6
7373
if: github.event.pull_request.draft == true
7474
with:
7575
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/update_iers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'astropy/astropy'
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
- name: Download latest IERS files
1717
run: ./update_builtin_iers.sh
1818
working-directory: astropy/utils/iers/data

0 commit comments

Comments
 (0)