Skip to content

Commit 35820e8

Browse files
committed
CI: set install prefix / build type explicitly, disable appveyor for now
1 parent a4a5474 commit 35820e8

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.appveyor.yml renamed to .appveyor_disabled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.13.{build}
1+
version: 1.14.{build}
22
pull_requests:
33
do_not_increment_build_number: true
44
shallow_clone: true
@@ -10,8 +10,8 @@ environment:
1010
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
1111
LSLARCH: x64
1212
build_script:
13-
- cmd: cmake -Dlslgitrevision=%APPVEYOR_REPO_COMMIT% -Dlslgitbranch=%APPVEYOR_REPO_BRANCH% -S . -B build -T v140,host=x86 -A %LSLARCH%
14-
- sh: cmake -Dlslgitrevision=${APPVEYOR_REPO_COMMIT} -Dlslgitbranch=${APPVEYOR_REPO_BRANCH} -S . -B build
13+
- cmd: cmake -DCMAKE_INSTALL_PREFIX=install DCMAKE_BUILD_TYPE=Release -Dlslgitrevision=%APPVEYOR_REPO_COMMIT% -Dlslgitbranch=%APPVEYOR_REPO_BRANCH% -S . -B build -T v140,host=x86 -A %LSLARCH%
14+
- sh: cmake -DCMAKE_INSTALL_PREFIX=install DCMAKE_BUILD_TYPE=Release -Dlslgitrevision=${APPVEYOR_REPO_COMMIT} -Dlslgitbranch=${APPVEYOR_REPO_BRANCH} -S . -B build
1515
- cmake -DLSL_UNITTESTS=ON -DLSL_BUILD_EXAMPLES=ON build
1616
- cmd: cmake --build build --config Release -j --target package
1717
- sh: /usr/bin/time -v cmake --build build -j 3 --target package

.github/workflows/cppcmake.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ jobs:
4040
- name: Configure CMake
4141
run: |
4242
cmake --version
43-
cmake -S . -B build ${{ matrix.config.cmake_extra }} \
43+
cmake -S . -B build \
44+
-DCMAKE_BUILD_TYPE=Release \
45+
-DCMAKE_INSTALL_PREFIX=${PWD}/install \
4446
-DLSL_UNITTESTS=ON \
4547
-DLSL_BUILD_EXAMPLES=ON \
4648
-DCPACK_PACKAGE_DIRECTORY=${PWD}/package \
47-
-DCMAKE_INSTALL_PREFIX=${PWD}/build/install \
4849
-Dlslgitrevision=${{ github.sha }} \
49-
-Dlslgitbranch=${{ github.ref }}
50+
-Dlslgitbranch=${{ github.ref }} \
51+
${{ matrix.config.cmake_extra }}
5052
- name: make
5153
run: cmake --build build --config Release -j --target install
5254

@@ -68,7 +70,7 @@ jobs:
6870
uses: actions/upload-artifact@master
6971
with:
7072
name: build-${{ matrix.config.name }}
71-
path: build/install
73+
path: install
7274

7375
- name: upload package
7476
uses: actions/upload-artifact@master
@@ -86,11 +88,11 @@ jobs:
8688
fi
8789
8890
- name: unit tests (internal functions)
89-
run: build/install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
91+
run: install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
9092
timeout-minutes: 5
9193

9294
- name: unit tests (exported functions)
93-
run: build/install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
95+
run: install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
9496
timeout-minutes: 5
9597
if: ${{ success() || failure() }}
9698
- name: upload to release page

0 commit comments

Comments
 (0)