Skip to content

Commit 13b75d0

Browse files
bdbaddogbdbaddog
authored
Merge pull request #4538 from mwichmann/pins
Change CI provisioning
2 parents 6edc6fc + 7b5748b commit 13b75d0

8 files changed

+111
-26
lines changed

‎.github/workflows/experimental_tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1717
jobs:
1818
# This workflow contains a single job called "build"
19-
build:
19+
experimental:
2020

2121
strategy:
2222
fail-fast: false
@@ -32,7 +32,7 @@ jobs:
3232
# Steps represent a sequence of tasks that will be executed as part of the job
3333
steps:
3434
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
35-
- uses: actions/[email protected].1
35+
- uses: actions/[email protected].6
3636

3737
# experiment: maybe don't need this?
3838
# update: looks like we do: with this commented out, the build hung
@@ -44,7 +44,7 @@ jobs:
4444
static: 0
4545

4646
- name: Set up Python 3.11 ${{ matrix.os }}
47-
uses: actions/setup-python@v5.0.0
47+
uses: actions/setup-python@v5.1.0
4848
with:
4949
python-version: '3.11'
5050

‎.github/workflows/framework_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929

3030
steps:
3131
# Checkouut repository under $GITHUB_WORKSPACE
32-
- uses: actions/[email protected].1
32+
- uses: actions/[email protected].6
3333

3434
- name: Set up Python 3.11 ${{ matrix.os }}
35-
uses: actions/setup-python@v5.0.0
35+
uses: actions/setup-python@v5.1.0
3636
with:
3737
python-version: '3.11'
3838

‎.github/workflows/runtest-win.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Full Test Suite on Windows
4+
5+
# Controls when the workflow will run
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
push:
9+
branches: [ master ]
10+
pull_request:
11+
branches: [ master ]
12+
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
jobs:
17+
runtest-win32:
18+
runs-on: windows-latest
19+
steps:
20+
- uses: actions/[email protected]
21+
22+
- name: Set up Python 3.12
23+
uses: actions/[email protected]
24+
with:
25+
python-version: '3.12'
26+
27+
- name: Install dependencies including ninja
28+
run: |
29+
python -m pip install --upgrade pip
30+
python -m pip install -r requirements-dev.txt
31+
32+
- name: runtest
33+
run: |
34+
python runtest.py --all --exclude-list=windows_ci_skip.txt --time --jobs=4
35+
36+
- name: Archive Failed tests
37+
uses: actions/[email protected]
38+
with:
39+
name: windows-failed-tests
40+
path: |
41+
failed_tests.log

‎.github/workflows/runtest.yml

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is a basic workflow to help you get started with Actions
22

3-
name: Linux Testing
3+
name: Full Test Suite on Linux
44

55
# Controls when the workflow will run
66
on:
@@ -15,25 +15,28 @@ on:
1515

1616
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1717
jobs:
18-
# This workflow contains a single job called "build"
19-
build:
20-
18+
# This workflow contains a single job called "runtest"
19+
runtest:
2120
strategy:
21+
fail-fast: false
2222
matrix:
23-
os: ['ubuntu-22.04']
23+
os: ['ubuntu-22.04', 'ubuntu-24.04']
2424

25-
# The type of runner that the job will run on
2625
runs-on: ${{ matrix.os }}
2726

28-
# Steps represent a sequence of tasks that will be executed as part of the job
2927
steps:
3028
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
31-
- uses: actions/[email protected]
29+
- uses: actions/[email protected]
30+
31+
- name: Install Ubuntu packages $${matrix.os}}
32+
run: |
33+
sudo apt-get update
34+
sudo apt-get install libtirpc-dev
3235
33-
- name: Set up Python 3.10 ${{ matrix.os }}
34-
uses: actions/setup-python@v5.0.0
36+
- name: Set up Python 3.12 ${{ matrix.os }}
37+
uses: actions/setup-python@v5.1.0
3538
with:
36-
python-version: '3.10'
39+
python-version: '3.12'
3740

3841
- name: Install dependencies including ninja ${{ matrix.os }}
3942
run: |
@@ -43,10 +46,10 @@ jobs:
4346
4447
- name: runtest ${{ matrix.os }}
4548
run: |
46-
python runtest.py --all --time --jobs=2
49+
python runtest.py --all --time --jobs=4
4750
4851
- name: Archive Failed tests ${{ matrix.os }}
49-
uses: actions/upload-artifact@v3.1.3
52+
uses: actions/upload-artifact@v4.3.3
5053
with:
5154
name: ${{ matrix.os }}-failed-tests
5255
path: |

‎.github/workflows/scons-package.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ on:
99
branches: [ master ]
1010

1111
jobs:
12-
build:
12+
package:
1313

14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515

1616
steps:
17-
- uses: actions/[email protected].1
17+
- uses: actions/[email protected].6
1818

19-
- name: Set up Python 3.10
20-
uses: actions/setup-python@v5.0.0
19+
- name: Set up Python 3.12
20+
uses: actions/setup-python@v5.1.0
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.12'
2323

2424
- name: Install dependencies
2525
run: |

‎requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# for now keep pinning "known working" lxml,
66
# it's been a troublesome component in the past.
77
# Skip lxml for win32 as no tests which require it currently pass on win32
8-
lxml==4.9.3; python_version < '3.13' and sys_platform != 'win32'
8+
lxml<5; python_version < '3.13' and sys_platform != 'win32'
99

1010
ninja
1111

‎requirements-pkg.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
readme-renderer
99

1010
# sphinx pinned because it has broken several times on new releases
11-
sphinx < 7.0
11+
sphinx
1212
sphinx-book-theme
1313
rst2pdf
1414

‎windows_ci_skip.txt

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# temporarily skip this in GitHub Windows runner
2+
test/CPPDEFINES/pkg-config.py
3+
test/Interactive/added-include.py
4+
test/Interactive/Alias.py
5+
test/Interactive/basic.py
6+
test/Interactive/cache-debug.py
7+
test/Interactive/cache-disable.py
8+
test/Interactive/cache-force.py
9+
test/Interactive/cache-show.py
10+
test/Interactive/clean.py
11+
test/Interactive/configure.py
12+
test/Interactive/Default-None.py
13+
test/Interactive/Default.py
14+
test/Interactive/exit.py
15+
test/Interactive/failure.py
16+
test/Interactive/help.py
17+
test/Interactive/implicit-VariantDir.py
18+
test/Interactive/option--Q.py
19+
test/Interactive/option-i.py
20+
test/Interactive/option-j.py
21+
test/Interactive/option-k.py
22+
test/Interactive/option-n.py
23+
test/Interactive/option-s.py
24+
test/Interactive/repeat-line.py
25+
test/Interactive/shell.py
26+
test/Interactive/tree.py
27+
test/Interactive/unknown-command.py
28+
test/Interactive/variant_dir.py
29+
test/MSVC/msvc.py
30+
test/packaging/msi/explicit-target.py
31+
test/packaging/msi/file-placement.py
32+
test/packaging/msi/package.py
33+
test/packaging/tar/xz_packaging.py
34+
test/scons-time/run/config/python.py
35+
test/scons-time/run/option/python.py
36+
test/scons-time/run/option/quiet.py
37+
test/scons-time/run/option/verbose.py
38+
test/sconsign/script/no-SConsignFile.py
39+
test/sconsign/script/SConsignFile.py
40+
test/sconsign/script/Signatures.py
41+

0 commit comments

Comments
 (0)