Skip to content

Commit ea9c6c8

Browse files
committed
Attempt to fix GitHub action (18)
1 parent 37c0add commit ea9c6c8

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

.github/workflows/cmake.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444

4545
win64:
46-
runs-on: windows-2019
46+
runs-on: windows-latest
4747
defaults:
4848
run:
4949
shell: msys2 {0}
@@ -65,24 +65,21 @@ jobs:
6565
mingw-w64-x86_64-libxml2
6666
6767
- name: Create Build Environment
68-
shell: bash
6968
run: mkdir build
7069

7170
- name: Configure CMake
72-
shell: bash
7371
run: |
7472
cd build
75-
cmake -DPKG_CONFIG_EXECUTABLE=D:/a/_temp/msys64/mingw64/bin/pkg-config.exe -G "MinGW Makefiles" ..
73+
cmake -G "MinGW Makefiles" ..
7674
7775
- name: Build
78-
shell: bash
7976
run: |
8077
cd build
8178
mingw32-make
8279
8380
8481
win32:
85-
runs-on: windows-2022
82+
runs-on: windows-latest
8683
defaults:
8784
run:
8885
shell: msys2 {0}
@@ -103,22 +100,15 @@ jobs:
103100
mingw-w64-i686-pkgconf
104101
mingw-w64-i686-libxml2
105102
106-
- name: Update
107-
shell: cmd
108-
run: C:\Windows\system32\cmd.exe /D /S /C D:\a\_temp\setup-msys2\msys2.cmd -c "'pacman' '--noconfirm' '-Syuu' '--overwrite' '*'"
109-
110103
- name: Create Build Environment
111-
shell: bash
112104
run: mkdir build
113105

114106
- name: Configure CMake
115-
shell: bash
116107
run: |
117108
cd build
118-
cmake -DPKG_CONFIG_EXECUTABLE=D:/a/_temp/msys64/mingw32/bin/pkg-config.exe -G "MinGW Makefiles" ..
109+
cmake -G "MinGW Makefiles" ..
119110
120111
- name: Build
121-
shell: bash
122112
run: |
123113
cd build
124114
mingw32-make

0 commit comments

Comments
 (0)