Skip to content

Commit 9d5f77f

Browse files
committed
gh: use cygwin-install-action rather builtin chocolatey
Chocolatey version 1.2.0 shipped with latest windows 2022 image does not seem to correctly install packages from Cygwin source. So move to cygwin/cygwin-install-action to install Cygwin packages.
1 parent dfef714 commit 9d5f77f

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

.github/workflows/windows_tests.yaml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
native:
1212
runs-on: windows-2022
1313
env:
14-
CYGWIN_BASH: C:\tools\cygwin\bin\bash
1514
TCL_INSTALLER: SetupTcl-8.6.10-x64_Bawt-1.2.1
1615
TCL_DL_URL: http://www.bawt.tcl3d.org/download/Tcl-Pure
1716
TCLSH_DIR: C:\Tcl\bin
@@ -24,22 +23,22 @@ jobs:
2423
- uses: actions/checkout@v3
2524
with:
2625
fetch-depth: 0
27-
- name: Install system packages
28-
run: |
26+
- uses: cygwin/cygwin-install-action@master
27+
with:
2928
# precise all sphinxcontrib packages required as dependency spec
3029
# of python39-sphinx package is regularly broken
31-
choco install make sed git autoconf automake libtool tcl python39 python39-sphinx zip python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxcontrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy --source cygwin
30+
packages: make sed git autoconf automake libtool tcl python39 python39-sphinx zip python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxco ntrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy
3231
- name: Install Tcl under Windows
3332
shell: cmd
3433
run: |
3534
curl -LfsS -o %TCL_INSTALLER%.exe %TCL_DL_URL%/%TCL_INSTALLER%.exe
3635
%TCL_INSTALLER% /verysilent
3736
- name: Configure Git safe.directory
3837
run: |
39-
& $env:CYGWIN_BASH -lc 'git config --global --add safe.directory $(cygpath -u "$GITHUB_WORKSPACE")'
38+
bash -lc 'git config --global --add safe.directory $(cygpath -u "$GITHUB_WORKSPACE")'
4039
- name: Build Modules dist
4140
run: |
42-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure --disable-libtclenvmodules && make dist-win'
41+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure --disable-libtclenvmodules && make dist-win'
4342
- name: Install Modules
4443
shell: cmd
4544
run: |
@@ -62,40 +61,38 @@ jobs:
6261
6362
cygwin:
6463
runs-on: windows-2022
65-
env:
66-
CYGWIN_BASH: C:\tools\cygwin\bin\bash
6764
steps:
6865
- name: Configure Git autocrlf
6966
shell: bash
7067
run: git config --global core.autocrlf input
7168
- uses: actions/checkout@v3
7269
with:
7370
fetch-depth: 0
74-
- name: Install system packages
75-
run: |
71+
- uses: cygwin/cygwin-install-action@master
72+
with:
7673
# precise all sphinxcontrib packages required as dependency spec
7774
# of python39-sphinx package is regularly broken
7875
# precise liblapack0 package needed by R package (missing depdency
7976
# since R-4.2.1-1)
80-
choco install make sed git autoconf automake libtool tcl dejagnu python39 python39-sphinx ruby zsh tcsh mksh fish cmake R liblapack0 tcl-devel gcc-core wget python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxcontrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy --source cygwin
77+
packages: make sed git autoconf automake libtool tcl dejagnu python39 python39-sphinx ruby zsh tcsh mksh fish cmake R liblapack0 tcl-devel gcc-core wget python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxcontrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy
8178
- name: Configure Git safe.directory
8279
run: |
83-
& $env:CYGWIN_BASH -lc 'git config --global --add safe.directory $(cygpath -u "$GITHUB_WORKSPACE")'
80+
bash -lc 'git config --global --add safe.directory $(cygpath -u "$GITHUB_WORKSPACE")'
8481
- name: Build Modules
8582
run: |
86-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure && make'
83+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure && make'
8784
- name: Test Modules build
8885
run: |
89-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && script/mt'
86+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && script/mt'
9087
- name: Install Modules
9188
run: |
92-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && make install'
89+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && make install'
9390
- name: Test Modules installation
9491
run: |
95-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && script/mt install'
92+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && script/mt install'
9693
- name: Uninstall Modules
9794
run: |
98-
& $env:CYGWIN_BASH -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && make uninstall'
95+
bash -lc 'cd $(cygpath -u "$GITHUB_WORKSPACE") && make uninstall'
9996
- uses: actions/upload-artifact@v3
10097
if: failure()
10198
with:

0 commit comments

Comments
 (0)