Skip to content

Commit 4818f19

Browse files
authored
CI: enable msvc config cache for windows workflow (SCons#4545)
And suitable environment var for the two Windows runners tweaks: pip now won't show progress bars installs a few extra pkgs for Windows (winflexbison3 and dmd - but dmd still needs to be added to PATH) Also add "quiet" option to choco install. Enable pip cache Signed-off-by: Mats Wichmann <[email protected]>
1 parent bc98dfc commit 4818f19

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

.github/workflows/experimental_tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on:
1313
# Allows you to run this workflow manually from the Actions tab
1414
workflow_dispatch:
1515

16+
env:
17+
# for use by the Windows runner (ignored by the others):
18+
SCONS_CACHE_MSVC_CONFIG: 1
19+
1620
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1721
jobs:
1822
# This workflow contains a single job called "build"
@@ -50,8 +54,8 @@ jobs:
5054

5155
- name: Install dependencies including ninja ${{ matrix.os }}
5256
run: |
53-
python -m pip install --upgrade pip setuptools wheel
54-
python -m pip install ninja psutil
57+
python -m pip install --progress-bar off --upgrade pip
58+
python -m pip install --progress-bar off ninja psutil
5559
# sudo apt-get update
5660
5761
- name: Test experimental packages ${{ matrix.os }}

.github/workflows/runtest-win.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
# Allows you to run this workflow manually from the Actions tab
1414
workflow_dispatch:
1515

16+
env:
17+
SCONS_CACHE_MSVC_CONFIG: 1
18+
1619
jobs:
1720
runtest-win32:
1821
runs-on: windows-latest
@@ -23,11 +26,16 @@ jobs:
2326
uses: actions/[email protected]
2427
with:
2528
python-version: '3.12'
29+
cache: 'pip'
30+
31+
- name: Install Python dependencies
32+
run: |
33+
python -m pip install --progress-bar off --upgrade pip
34+
python -m pip install --progress-bar off -r requirements-dev.txt
2635
27-
- name: Install dependencies including ninja
36+
- name: Install Chocolatey packages
2837
run: |
29-
python -m pip install --upgrade pip
30-
python -m pip install -r requirements-dev.txt
38+
choco install --yes --no-progress dmd winflexbison3
3139
3240
- name: runtest
3341
run: |

.github/workflows/runtest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ jobs:
3737
uses: actions/[email protected]
3838
with:
3939
python-version: '3.12'
40+
cache: 'pip'
4041

41-
- name: Install dependencies including ninja ${{ matrix.os }}
42+
- name: Install Python dependencies ${{ matrix.os }}
4243
run: |
43-
python -m pip install --upgrade pip setuptools wheel
44-
python -m pip install -r requirements-dev.txt
44+
python -m pip install --progress-bar off --upgrade pip
45+
python -m pip install --progress-bar off -r requirements-dev.txt
4546
# sudo apt-get update
4647
4748
- name: runtest ${{ matrix.os }}

.github/workflows/scons-package.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ jobs:
2020
uses: actions/[email protected]
2121
with:
2222
python-version: '3.12'
23+
cache: 'pip'
2324

2425
- name: Install dependencies
2526
run: |
26-
python -m pip install --upgrade pip setuptools wheel build
27+
python -m pip install --progress-bar off --upgrade pip setuptools wheel
2728
#python -m pip install flake8 pytest
28-
if [ -f requirements-pkg.txt ]; then pip install -r requirements-pkg.txt; elif [ -f requirements.txt ]; then pip install -r requirements.txt; fi
29+
if [ -f requirements-pkg.txt ]; then pip install --progress-bar off -r requirements-pkg.txt; elif [ -f requirements.txt ]; then pip install --progress-bar off -r requirements.txt; fi
2930
sudo apt-get update
3031
sudo apt-get -y install docbook-xml docbook-xsl xsltproc fop docbook-xsl-doc-pdf
3132
# try to keep the texlive install as small as we can to save some time/space

0 commit comments

Comments
 (0)