From 16a9546c975e8fa7ba083a732a6226537bc079ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Fri, 27 Aug 2021 15:51:21 +0200 Subject: [PATCH 1/5] actions: Build aarch64 flatpak --- .github/workflows/flatpak.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 2c79106b..b17be85b 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -13,13 +13,17 @@ jobs: container: image: bilelmoussaoui/flatpak-github-actions:gnome-40 options: --privileged + strategy: + matrix: + arch: [x86_64, aarch64] steps: - uses: actions/checkout@v2 with: submodules: recursive - - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3 + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 name: "Build" with: bundle: com.github.rafostar.Clapper.flatpak manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json cache-key: flatpak-builder-${{ github.sha }} + arch: ${{ matrix.arch }} From 9e8854c5e2127a530a37a95def9577aee8440779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Fri, 27 Aug 2021 15:56:27 +0200 Subject: [PATCH 2/5] actions: Use GNOME nightly repo and rename to nightly Rename flatpak-testing into flatpak-nightly so it reflects that it uses GNOME nightly sources now and builds itself every night (with nightly gstreamer too). --- .../workflows/{flatpak-testing.yml => flatpak-nightly.yml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{flatpak-testing.yml => flatpak-nightly.yml} (85%) diff --git a/.github/workflows/flatpak-testing.yml b/.github/workflows/flatpak-nightly.yml similarity index 85% rename from .github/workflows/flatpak-testing.yml rename to .github/workflows/flatpak-nightly.yml index 10372eed..ce7b1d98 100644 --- a/.github/workflows/flatpak-testing.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -1,19 +1,19 @@ on: schedule: - cron: "0 0 * * *" -name: "Flatpak Testing" +name: "Flatpak Nightly" jobs: flatpak: name: "Flatpak" runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-nightly options: --privileged steps: - uses: actions/checkout@v2 with: submodules: recursive - - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3 + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 name: "Build" with: bundle: com.github.rafostar.Clapper.flatpak From 10eb5102c19a1d877b890d52c1218e8a2ee1d645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Fri, 27 Aug 2021 15:57:18 +0200 Subject: [PATCH 3/5] actions: Also build for aarch64 in nightly flatpak --- .github/workflows/flatpak-nightly.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index ce7b1d98..52d56d56 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -9,6 +9,9 @@ jobs: container: image: bilelmoussaoui/flatpak-github-actions:gnome-nightly options: --privileged + strategy: + matrix: + arch: [x86_64, aarch64] steps: - uses: actions/checkout@v2 with: @@ -19,3 +22,4 @@ jobs: bundle: com.github.rafostar.Clapper.flatpak manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-testing.json cache-key: flatpak-builder-${{ github.sha }}-testing-${{ github.run_number }} + arch: ${{ matrix.arch }} From 7cdd905d734b23e6a11149ada0c386d30365d178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Fri, 27 Aug 2021 16:07:36 +0200 Subject: [PATCH 4/5] actions: Do not fail both runs when one fails --- .github/workflows/flatpak-nightly.yml | 1 + .github/workflows/flatpak.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index 52d56d56..7de8a33e 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -12,6 +12,7 @@ jobs: strategy: matrix: arch: [x86_64, aarch64] + fail-fast: false steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index b17be85b..e9d7f011 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -16,6 +16,7 @@ jobs: strategy: matrix: arch: [x86_64, aarch64] + fail-fast: false steps: - uses: actions/checkout@v2 with: From 66998ff6c6057b0c51d0e551d4b68deb11b8fcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Fri, 27 Aug 2021 17:02:40 +0200 Subject: [PATCH 5/5] actions: Install docker with arm64 quemu Flatpak builder needs this to compile aarch64 package --- .github/workflows/flatpak-nightly.yml | 8 ++++++++ .github/workflows/flatpak.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index 7de8a33e..a72012d4 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -17,6 +17,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive + - name: Install Docker + run: | + dnf -y install docker + - name: Setup QEMU + id: qemu + uses: docker/setup-qemu-action@v1 + with: + platforms: arm64 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 name: "Build" with: diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index e9d7f011..b1bd16bc 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -21,6 +21,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive + - name: Install Docker + run: | + dnf -y install docker + - name: Setup QEMU + id: qemu + uses: docker/setup-qemu-action@v1 + with: + platforms: arm64 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 name: "Build" with: