Skip to content

Commit dc8be22

Browse files
committed
Update github actions
1 parent bb51830 commit dc8be22

1 file changed

Lines changed: 17 additions & 11 deletions

File tree

.github/workflows/multi-os-build.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
# Space-separated list of packages to install using apt-get. Will only run if on ubuntu.
2121
apt-get: libssl-dev cmake binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
2222
- name: Checkout with submodules
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
- name: config shared=${{ matrix.shared }}
2525
run: >-
2626
cmake
@@ -35,30 +35,27 @@ jobs:
3535
runs-on: macos-latest
3636
steps:
3737
- name: Checkout with submodules
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939
- name: config
4040
run: >-
4141
cmake
4242
-Bbuild
4343
-DENABLE_TESTS=Off
4444
- name: Compile
4545
run: cmake --build build
46-
# - name: Compile
47-
# run: CFLAGS="-I$(brew --prefix openssl@1.1)/include/" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib/" make
4846

49-
build-win64:
47+
build-win64-cygwin:
5048
runs-on: windows-latest
5149
steps:
5250
- name: Install Cygwin
5351
# You may pin to the exact commit or the version.
5452
# uses: egor-tensin/setup-cygwin@4f96f9fecb8c952fa32ff791b0a77d93d5191bb4
5553
uses: egor-tensin/setup-cygwin@v4
5654
with:
57-
platform: x64 # optional, default is x64
5855
install-dir: c:\tools\cygwin # optional, default is C:\tools\cygwin
5956
packages: gcc-core gcc-g++ binutils make ninja zip libssl-devel cmake # optional
6057
- name: Checkout with submodules
61-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
6259
- name: Config
6360
run: >-
6461
cmake
@@ -69,8 +66,17 @@ jobs:
6966
run: cmake --build build
7067
- name: Pack
7168
run: cd build && cpack -G CygwinBinary
72-
# - name: Compile
73-
# run: make
74-
# - name: Compile Windows-only tools and create a ZIP package
75-
# run: make zip
7669

70+
build-win64-msvc:
71+
runs-on: windows-latest
72+
steps:
73+
- uses: actions/checkout@v4
74+
- uses: ilammy/msvc-dev-cmd@v1
75+
- name: Install OpenSSL
76+
run: vcpkg install openssl
77+
- name: Build with CL.EXE
78+
run: |
79+
cmake -G "NMake Makefiles" -B build
80+
cmake --build build
81+
- name: Package
82+
run: cd build && cpack -G ZIP

0 commit comments

Comments
 (0)