Skip to content

Commit 19cea67

Browse files
committed
drop appveyor. run MingW 32 and cmake builds on github
1 parent e67846e commit 19cea67

4 files changed

Lines changed: 57 additions & 118 deletions

File tree

.github/workflows/windows.yml

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,11 @@ jobs:
190190
matrix:
191191
include:
192192
- config: address-model=64
193+
msys2_pkg: mingw-w64-x86_64
194+
msystem: MINGW64
195+
- config: address-model=32
196+
msys2_pkg: mingw-w64-i686
197+
msystem: MINGW32
193198

194199
steps:
195200
- name: checkout
@@ -215,9 +220,10 @@ jobs:
215220
with:
216221
release: false
217222
update: true
223+
msystem: ${{ matrix.msystem }}
218224
install: >-
219-
mingw-w64-x86_64-gcc
220-
mingw-w64-x86_64-openssl
225+
${{ matrix.msys2_pkg }}-gcc
226+
${{ matrix.msys2_pkg }}-openssl
221227
222228
- name: tests (deterministic)
223229
shell: msys2 {0}
@@ -226,4 +232,45 @@ jobs:
226232
export PATH="$BOOST_ROOT:$PATH"
227233
export PYTHON_INTERPRETER=python
228234
cd test
229-
b2 toolset=gcc crypto=openssl-shared link=static asserts=on release target-os=windows -l400 warnings=all warnings-as-errors=on ${{ matrix.config }} cxxflags=-Wno-error=array-bounds cxxflags=-Wno-error=stringop-overflow cxxflags=-Wno-error=clobbered deterministic-tests testing.execute=off --hash
235+
b2 toolset=gcc crypto=openssl-shared link=static asserts=on release target-os=windows -l400 warnings=all warnings-as-errors=on ${{ matrix.config }} cxxflags=-Wno-error=array-bounds cxxflags=-Wno-error=stringop-overflow cxxflags=-Wno-error=clobbered deterministic-tests --hash
236+
237+
cmake:
238+
name: cmake
239+
runs-on: windows-2022
240+
continue-on-error: true
241+
242+
steps:
243+
- name: checkout
244+
uses: actions/checkout@v6
245+
with:
246+
submodules: recursive
247+
fetch-depth: 1
248+
filter: tree:0
249+
250+
- name: install boost
251+
run: |
252+
git clone --depth=1 --recurse-submodules -j10 --branch=boost-1.90.0 https://github.com/boostorg/boost.git
253+
cd boost
254+
bootstrap.bat
255+
256+
- name: stage boost libraries
257+
run: |
258+
cd boost
259+
b2 cxxstd=17 release --with-system --layout=system address-model=64 link=shared stage
260+
261+
- name: cmake configure
262+
run: |
263+
set BOOST_ROOT=%CD%\boost
264+
cmake -B build -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_ROOT%\stage\lib -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=ON -Dbuild_examples=ON -Dbuild_tools=ON -Dwebtorrent=on -DOPENSSL_ROOT_DIR="C:\Program Files\OpenSSL" -Dskip-python-runtime-test=true -G "Visual Studio 17 2022" -A x64
265+
266+
- name: cmake build
267+
run: cmake --build build --config Debug --parallel %NUMBER_OF_PROCESSORS%
268+
269+
- name: ctest
270+
uses: nick-fields/retry@v3
271+
with:
272+
max_attempts: 3
273+
timeout_minutes: 120
274+
command: |
275+
cd build
276+
ctest --build-config Debug --parallel $env:NUMBER_OF_PROCESSORS --output-on-failure

Jamfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,13 @@ rule warnings ( properties * )
351351
# these warnings seem to have a lot of false positives
352352
result += <cxxflags>-Wno-error=stringop-overflow ;
353353
result += <cxxflags>-Wno-error=array-bounds ;
354+
if <address-model>32 in $(properties)
355+
{
356+
# mingw32 has false positives for this warning
357+
result += <cxxflags>-Wno-error=alloc-size-larger-than= ;
358+
# mingw32's __emutls causes crashes in thread_local destructors on exit
359+
result += <define>BOOST_NO_CXX11_THREAD_LOCAL ;
360+
}
354361
}
355362

356363
if <toolset>msvc in $(properties)

README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
.. image:: https://github.com/arvidn/libtorrent/actions/workflows/python.yml/badge.svg
1313
:target: https://github.com/arvidn/libtorrent/actions/workflows/python.yml
1414

15-
.. image:: https://ci.appveyor.com/api/projects/status/w7teauvub5813mew/branch/RC_2_0?svg=true
16-
:target: https://ci.appveyor.com/project/arvidn/libtorrent/branch/RC_2_0
17-
1815
.. image:: https://api.cirrus-ci.com/github/arvidn/libtorrent.svg?branch=RC_2_0
1916
:target: https://cirrus-ci.com/github/arvidn/libtorrent
2017

appveyor.yml

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)