Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit e18b31d

Browse files
committed
...
1 parent e3ee082 commit e18b31d

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,33 +86,28 @@ jobs:
8686
platform: ${{matrix.platform}}
8787
cachedir: qt/${{matrix.version}}/${{matrix.platform}}
8888
- name: qmake
89-
shell: ${{steps.qt.outputs.shell}}
9089
run: |
91-
qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} CONFIG+=${{matrix.config}} || exit 1
92-
${{steps.qt.outputs.make}} qmake_all || exit 1
90+
qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} CONFIG+=${{matrix.config}}
91+
${{steps.qt.outputs.make}} qmake_all
9392
- name: make module
94-
shell: ${{steps.qt.outputs.shell}}
9593
run: |
96-
${{steps.qt.outputs.make}} || exit 1
97-
${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install || exit 1
94+
${{steps.qt.outputs.make}}
95+
${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
9896
- name: make tests
9997
if: matrix.converters == 'enabled' && steps.qt.outputs.tests == 'true'
100-
shell: ${{steps.qt.outputs.shell}}
10198
run: |
102-
${{steps.qt.outputs.make}} all || exit 1
103-
${{steps.qt.outputs.make}} ${{steps.qt.outputs.testflags}} run-tests || exit 1
99+
${{steps.qt.outputs.make}} all
100+
${{steps.qt.outputs.make}} ${{steps.qt.outputs.testflags}} run-tests
104101
- name: make examples
105102
if: matrix.converters == 'enabled' && matrix.platform == 'gcc_64'
106-
shell: ${{steps.qt.outputs.shell}}
107103
run: |
108-
${{steps.qt.outputs.make}} sub-examples || exit 1
109-
cd examples && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install || exit 1
104+
${{steps.qt.outputs.make}} sub-examples
105+
cd examples && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
110106
- name: make doc
111107
if: matrix.converters == 'enabled' && matrix.platform == 'gcc_64'
112-
shell: ${{steps.qt.outputs.shell}}
113108
run: |
114-
${{steps.qt.outputs.make}} doxygen || exit 1
115-
cd doc && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install || exit 1
109+
${{steps.qt.outputs.make}} doxygen
110+
cd doc && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
116111
- name: upload module to releases
117112
uses: Skycoder42/action-upload-release@master
118113
if: matrix.converters == 'enabled' && startsWith(github.ref, 'refs/tags/')

0 commit comments

Comments
 (0)