Skip to content

Commit

Permalink
try to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
wojdyr committed Aug 8, 2022
1 parent cc601fc commit 8155be0
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 26 deletions.
45 changes: 24 additions & 21 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
version: '{branch}-{build}'
configuration: Release
clone_depth: 1
environment:
matrix:
- CMAKE_GEN: Visual Studio 17 2022 Win64
- CMAKE_GEN: Visual Studio 12 2013
cache:
- C:\ProgramData\chocolatey\bin
- C:\ProgramData\chocolatey\lib
build_script:
- cmd: >-
IF NOT EXIST C:\ProgramData\chocolatey\bin\swig.exe cinst -y --allow-empty-checksums swig
cmake -D BOOST_ROOT=C:\Libraries\boost_1_63_0 -G "%CMAKE_GEN%" .
cmake --build . --config Release --target install
test_script:
- cmd: >-
set path=%cd%\inst\bin;%path%
ctest -C Release -V
artifacts:
- path: inst
version: '{branch}-{build}'
configuration: Release
clone_depth: 1
environment:
matrix:
- CMAKE_GEN: Visual Studio 17 2022 Win64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
BOOST: C:\Libraries\boost_1_77_0
- CMAKE_GEN: Visual Studio 12 2013
BOOST: C:\Libraries\boost_1_63_0
cache:
- C:\ProgramData\chocolatey\bin
- C:\ProgramData\chocolatey\lib
build_script:
- cmd: >-
IF NOT EXIST C:\ProgramData\chocolatey\bin\swig.exe choco install --version 4.0.1 swig -y --limit-output
cmake -D BOOST_ROOT=%BOOST% -G "%CMAKE_GEN%" .
cmake --build . --config Release --target install
test_script:
- cmd: >-
set path=%cd%\inst\bin;%path%
ctest -C Release -V
artifacts:
- path: inst
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
- uses: actions/checkout@v2
- name: dependencies
run: |
sudo apt-get update
sudo apt-get install g++ libz-dev libboost-dev libwxgtk3.0-gtk3-dev swig libxy-dev liblua5.3-dev lua5.3
curl -LsS -o tests/catch.hpp https://github.com/philsquared/Catch/releases/download/v1.10.0/catch.hpp
- name: build
Expand All @@ -27,22 +28,22 @@ jobs:
cfityk --version
clang39:
name: "Ubuntu 18.04, Clang 3.9"
name: "Ubuntu 18.04, Clang"
runs-on: ubuntu-18.04
if: "!contains(github.event.head_commit.message, '[skip ci]')"
env:
CC: clang-3.9
CXX: clang++-3.9
CC: clang
CXX: clang++
steps:
- uses: actions/checkout@v2
- name: dependencies
run: |
sudo apt-get install clang-3.9 cmake libz-dev libboost-dev liblua5.2-dev lua5.2
sudo apt-get install clang cmake libz-dev libboost-dev liblua5.2-dev lua5.2
- name: build
run: |
$CXX --version
cmake --version
cmake . -DDOWNLOAD_XYLIB=ON -DDOWNLOAD_LUA=OFF -DDOWNLOAD_ZLIB=OFF -DCMAKE_CXX_STANDARD=11
cmake . -DDOWNLOAD_XYLIB=ON -DDOWNLOAD_LUA=OFF -DDOWNLOAD_ZLIB=OFF
make VERBOSE=1
sudo make install
- name: test
Expand Down

0 comments on commit 8155be0

Please sign in to comment.