Skip to content

Commit

Permalink
compile fails test, require qt5.15 c++17
Browse files Browse the repository at this point in the history
If some steps of compile.sh doesn't return 0, the whole compile.sh will
return 1, so github actions can actually notify if build fails
  • Loading branch information
Stivvo committed Aug 24, 2020
1 parent 1bf8250 commit d683e82
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
qt_version: [5.15.0]
platform: [ubuntu-20.04]
platform: [ubuntu-latest]
arch: [x64]
fail-fast: false
runs-on: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ To run only ``qt5-base`` (Archlinux) or ``qt5-default`` (Debian) is required.

### Compile

To compile, Qt version must be at least 5.14.
To compile, Qt version must be at least 5.15.

```bash
mkdir wayPreview1
Expand Down
8 changes: 4 additions & 4 deletions scripts/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ PW="${PWD}"

mkdir ../../clientBuild/
cd ../../clientBuild
qmake ../wayPreview/wayPreviewClient/wayPreviewClient.pro
make -j$NPROC
qmake ../wayPreview/wayPreviewClient/wayPreviewClient.pro || exit 1
make -j$NPROC || exit 1

cd "${PW}"

mkdir ../../serverBuild/
cd ../../serverBuild
qmake ../wayPreview/wayPreviewServer/wayPreviewServer.pro
make -j$NPROC
qmake ../wayPreview/wayPreviewServer/wayPreviewServer.pro || exit 1
make -j$NPROC || exit 1

cd "${PW}"
2 changes: 1 addition & 1 deletion wayPreviewClient/wayPreviewClient.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
QT += widgets network
CONFIG += c++17
CONFIG += c++1z

SOURCES = main.cpp
2 changes: 1 addition & 1 deletion wayPreviewServer/wayPreviewServer.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
QT += widgets network
CONFIG += c++17
CONFIG += c++1z

HEADERS = wayPreviewServer.h
SOURCES = wayPreviewServer.cpp \
Expand Down

0 comments on commit d683e82

Please sign in to comment.