summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2022-04-02 16:44:10 +0200
committerSebastian Pipping <sebastian@pipping.org>2022-04-02 17:04:28 +0200
commite22d18fab2c15f9b4fef087973d786635b991498 (patch)
tree96a8f3f7c4dd7c02cc25904832f1b2723b764855
parentd3da9a182b97a2c8914fb0dce15f42dbc669dd78 (diff)
downloaduriparser-e22d18fab2c15f9b4fef087973d786635b991498.tar.gz
Actions: Resolve parts of the matrix that are now redundant
-rw-r--r--.github/workflows/build-and-test.yml8
1 files changed, 2 insertions, 6 deletions
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6e6b6a9..5bc732b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,8 +16,6 @@ jobs:
matrix:
include:
- name: Native Linux
- runs-on: ubuntu-20.04
- qhelpgenerator_package: qhelpgenerator-qt5
cmake_args: >-
-DCMAKE_C_COMPILER=clang-14
-DCMAKE_CXX_COMPILER=clang++-14
@@ -28,15 +26,13 @@ jobs:
ldflags: >-
-fsanitize=address
- name: MingGW on Linux
- runs-on: ubuntu-20.04
- qhelpgenerator_package: qhelpgenerator-qt5
cmake_args: >-
-DCMAKE_C_COMPILER=i686-w64-mingw32-gcc
-DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++
-DCMAKE_SYSTEM_NAME=Windows
-DWIN32=ON
-DMINGW=ON
- runs-on: ${{ matrix.runs-on }}
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3.0.0
@@ -57,7 +53,7 @@ jobs:
doxygen \
graphviz \
lzip \
- ${{ matrix.qhelpgenerator_package }} \
+ qhelpgenerator-qt5 \
qtchooser
- name: Install build dependencies (MinGW)