Skip to content

Commit f06191c

Browse files
committed
ci: Windows wasn't meant to be doing install + fix Linux prefix...
1 parent bfe8a91 commit f06191c

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/cmake.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
8787
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
8888
-DCMAKE_PREFIX_PATH:PATH="${{ env.QT_ROOT_DIR }}"
89+
-DCMAKE_INSTALL_PREFIX=/
8990
-S ${{ github.workspace }}
9091
9192
- name: Build
@@ -112,6 +113,7 @@ jobs:
112113
UnCSO2-*.AppImage
113114
114115
- name: Install
116+
if: matrix.os != 'windows-latest'
115117
run: |
116118
DESTDIR="build/install/" cmake --install build
117119
install -Dm644 "COPYING" -t "build/install/share/licenses/uncso2"
@@ -121,9 +123,10 @@ jobs:
121123
rm -rf "build/install/lib/libcryptopp.a"
122124
rm -rf "build/install/share/cmake"
123125
rm -rf "build/install/share/cryptopp"
124-
rm -rf "build/install/share/pkgconfig/cryptopp.pc"
126+
rm -rf "build/install/share/pkgconfig"
125127
126128
- name: Upload install artifacts
129+
if: matrix.os != 'windows-latest'
127130
uses: actions/upload-artifact@v4
128131
with:
129132
name: install-${{ matrix.c_compiler }}-${{ matrix.os }}

tf.harmony.UnCSO2.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ modules:
1515
config-opts:
1616
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
1717
cleanup:
18-
- /share/man
18+
- /bin/cryptest
19+
- /include
1920
- /share/cmake
2021
- /share/cryptopp
21-
- /include
22-
- /bin/cryptest
22+
- /share/man
23+
- /share/pkgconfig
2324
- '*.a'
2425
sources:
2526
- type: dir

0 commit comments

Comments
 (0)