From 75f53b669c7693e816d0f20b948a912b51f06272 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 25 Dec 2022 13:57:14 +0900 Subject: [PATCH 1/4] use ubuntu 22.04 --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 638d073..471b011 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -name: Build (Linux, Ubuntu 18.04) +name: Build (Linux, Ubuntu 22.04) on: - pull_request @@ -22,8 +22,8 @@ on: jobs: build: - name: Build (Linux, Ubuntu 18.04) - runs-on: ubuntu-18.04 + name: Build (Linux, Ubuntu 22.04) + runs-on: ubuntu-22.04 steps: - name: 'Install build dependencies' run: |- From fc788d70399df18ba9b74ec3022776f5688d875b Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 25 Dec 2022 14:03:59 +0900 Subject: [PATCH 2/4] use qt5-qmake --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 471b011..36eeaf6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: build-essential \ libapr1-dev \ libsvn-dev \ - qt5-default \ + qt5-qmake \ qtbase5-dev - name: 'Checkout Git branch' From 3ae07eed89d0902ec812659b9971ee1dfdcb0a44 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 25 Dec 2022 14:09:22 +0900 Subject: [PATCH 3/4] update actions version --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 36eeaf6..8a420c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -37,7 +37,7 @@ jobs: qtbase5-dev - name: 'Checkout Git branch' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true From 000fc119d7eaf98a035159e14a738979e0d36f03 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 25 Dec 2022 14:18:10 +0900 Subject: [PATCH 4/4] add build matrix --- .github/workflows/build.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a420c9..ef0e1bb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -name: Build (Linux, Ubuntu 22.04) +name: Build (Linux, Ubuntu) on: - pull_request @@ -22,8 +22,17 @@ on: jobs: build: - name: Build (Linux, Ubuntu 22.04) - runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - runs-on: ubuntu-22.04 + qt: qt5-qmake + - runs-on: ubuntu-18.04 + qt: qt5-default + + name: Build (Linux, ${{ matrix.runs-on }}) + runs-on: ${{ matrix.runs-on }} steps: - name: 'Install build dependencies' run: |- @@ -33,7 +42,7 @@ jobs: build-essential \ libapr1-dev \ libsvn-dev \ - qt5-qmake \ + ${{ matrix.qt }} \ qtbase5-dev - name: 'Checkout Git branch'