Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove tests for matrix.skip_gui in workflow files

Browse Source 
This setting is used, so just remove all the tests for it.
This commit is contained in:
Vadim Zeitlin
2021-08-28 23:41:31 +02:00
parent dd33dc2d68
commit d81dc9f125
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View File

@@ -185,9 +185,7 @@ jobs:
- name: Building tests - name: Building tests
working-directory: tests working-directory: tests
run: | run: |
if [ !${{ matrix.skip_gui }} ]; then make $wxBUILD_ARGS failtest
make $wxBUILD_ARGS failtest
fi
make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
- name: Testing - name: Testing
@@ -217,7 +215,7 @@ jobs:
fi fi
- name: Testing GUI using Xvfb - name: Testing GUI using Xvfb
if: matrix.skip_gui != true && matrix.use_xvfb if: matrix.use_xvfb
working-directory: tests working-directory: tests
run: | run: |
if [ ${{ matrix.use_asan }} ]; then if [ ${{ matrix.use_asan }} ]; then
@@ -247,7 +245,7 @@ jobs:
fi fi
- name: Building samples - name: Building samples
if: matrix.skip_gui != true && matrix.skip_samples != true if: matrix.skip_samples != true
run: | run: |
make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples

6
.github/workflows/ci_mac.yml vendored
View File

@@ -182,9 +182,7 @@ jobs:
- name: Building tests - name: Building tests
run: | run: |
if [ !${{ matrix.skip_gui }} ]; then make -C tests $wxBUILD_ARGS failtest
make -C tests $wxBUILD_ARGS failtest
fi
make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
- name: Testing - name: Testing
@@ -202,7 +200,7 @@ jobs:
fi fi
- name: Building samples - name: Building samples
if: matrix.skip_testing != true && matrix.skip_gui != true && matrix.skip_samples != true if: matrix.skip_testing != true && matrix.skip_samples != true
run: | run: |
make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples