Skip to content

Commit 3df7541

Browse files
committed
Fix #157 - test CI [travis] and [gha]
1 parent 6269fe9 commit 3df7541

File tree

2 files changed

+710
-706
lines changed

2 files changed

+710
-706
lines changed

.github/workflows/build-ci.yml

+36-28
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
name: Prepare for Windows
4848
run: |
4949
dir
50+
# DONT NEED IT. FOR DEBUG ONLY
5051
# pip install aqtinstall
5152
# aqt list-qt linux desktop
5253
# aqt list-qt windows desktop
@@ -57,6 +58,7 @@ jobs:
5758
name: Install dependencies
5859
run: |
5960
ls
61+
# DONT NEED IT. FOR DEBUG ONLY
6062
# pip install aqtinstall
6163
# aqt list-qt linux desktop
6264
# aqt list-qt linux desktop --long-modules ${{ matrix.qt-version }} win64_mingw
@@ -67,6 +69,7 @@ jobs:
6769
name: Install for macOS
6870
run: |
6971
ls
72+
# DONT NEED IT. FOR DEBUG ONLY
7073
# pip install aqtinstall
7174
# aqt list-qt mac desktop
7275
# aqt list-qt mac desktop --modules ${{ matrix.qt-version }}
@@ -117,33 +120,32 @@ jobs:
117120
#
118121
# Build SocNetV
119122
#
120-
# - if: contains( matrix.os, 'ubuntu-latest')
121-
# name: Build for Linux
122-
# run: |
123-
# echo "openssl version:"
124-
# echo `openssl version`
125-
# echo "Check output of 'which qmake6':"
126-
# which qmake6
127-
# echo "Check qmake6 -v:"
128-
# qmake6 -v
129-
# qmake6 CONFIG+=debug && make -s -j 8
130-
# echo "Building finished! "
131-
# echo "Files in current directory: "
132-
# find .
133-
# # BUILD FOR MACOS
134-
# - if: contains( matrix.os, 'macos')
135-
# name: Build for macOS
136-
# run: |
137-
# qmake CONFIG+=debug socnetv.pro
138-
# make -s -j 8
139-
# find .
123+
- if: contains( matrix.os, 'ubuntu-latest')
124+
name: Build for Linux
125+
run: |
126+
echo "openssl version:"
127+
echo `openssl version`
128+
echo "Check output of 'which qmake6':"
129+
which qmake6
130+
echo "Check qmake6 -v:"
131+
qmake6 -v
132+
qmake6 CONFIG+=debug && make -s -j 8
133+
echo "Building finished! "
134+
echo "Files in current directory: "
135+
find .
136+
# BUILD FOR MACOS
137+
- if: contains( matrix.os, 'macos')
138+
name: Build for macOS
139+
run: |
140+
qmake CONFIG+=debug socnetv.pro
141+
make -s -j 8
142+
find .
140143
# BUILD FOR WINDOWS
141144
- if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' ) && matrix.qt-version == '6.2.4'
142145
name: Build for Windows
143146
run: |
144147
echo "Listing some directories"
145148
dir D:\a\app\Qt\
146-
dir D:\a\app\Qt\6.2.4
147149
echo "Running qmake6"
148150
qmake6 CONFIG+=debug socnetv.pro -r
149151
echo "Compiling, please wait..."
@@ -164,19 +166,25 @@ jobs:
164166
run: |
165167
echo "Listing some directories"
166168
dir D:\a\app\Qt\
167-
echo "Running qmake6"
168-
qmake6 CONFIG+=debug socnetv.pro -r
169-
echo "Compiling with nmake. Please wait..."
170-
nmake
171-
dir
169+
echo "Creating build dir"
170+
mkdir build
171+
echo "Running cmake ..."
172+
cmake -S . -B build
173+
echo "Compiling with cmake at once. Please wait..."
174+
cmake --build build
175+
dir build
172176
- if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' ) && matrix.qt-version == '6.6.3'
173177
name: Build for Windows
174178
run: |
175179
echo "Listing some directories"
176180
dir D:\a\app\Qt\
181+
echo "Creating build dir"
182+
mkdir build
183+
echo "Entering build dir"
184+
cd build
177185
echo "Running cmake"
178-
qmake6 CONFIG+=debug socnetv.pro -r
186+
cmake ..
179187
echo "Compiling with nmake. Please wait..."
180188
nmake
181-
dir
189+
dir build
182190
- run: echo "🍏 This job's status is ${{ job.status }}."

0 commit comments

Comments
 (0)