From a5f8c62d1a539662122855f2d2341e278724af00 Mon Sep 17 00:00:00 2001
From: Dark Dragon <darkdragon-001@web.de>
Date: Sat, 17 Jun 2023 01:10:42 +0200
Subject: [PATCH 1/2] Use matrix to simplify packaging workflow

---
 .github/workflows/package.yaml | 83 ++++------------------------------
 1 file changed, 10 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 2a8bca6ac..9ec23ef14 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -52,8 +52,11 @@ jobs:
           path: Axolotl-x86_64.AppImage
           retention-days: 5
 
-  package-click-armhf:
-    name: Package as click armhf
+  package-click:
+    strategy:
+      matrix:
+        arch: [armhf, arm64, amd64]
+    name: Package as click ${{ matrix.arch }}
     runs-on: ubuntu-latest
 
     steps:
@@ -70,82 +73,16 @@ jobs:
           mkdir $GITHUB_WORKSPACE/axolotl-web/dist
           cp -rf build-artifacts/axolotl-web/* $GITHUB_WORKSPACE/axolotl-web/dist
 
-      - name: Build click (armhf)
-        uses: docker://clickable/ci-20.04-armhf:7.11.0
-        env:
-          GOPATH: $GITHUB_WORKSPACE/go
-        with:
-          args: clickable build --verbose -a armhf --app
-
-      - name: Upload the built click artifact (armhf)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Axolotl-Clickable
-          path: build/arm-linux-gnueabihf/app/textsecure.nanuc_*.click
-          retention-days: 1
-
-  package-click-arm64:
-    name: Package as click arm64
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Download axolotl and axolotl-web build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: build-artifacts
-
-      - name: Put axolotl web in place
-        run: |
-          mkdir $GITHUB_WORKSPACE/axolotl-web/dist
-          cp -rf build-artifacts/axolotl-web/* $GITHUB_WORKSPACE/axolotl-web/dist
-
-      - name: Build click (arm64)
-        uses: docker://clickable/ci-20.04-arm64:7.11.0
-        env:
-          GOPATH: $GITHUB_WORKSPACE/go
-        with:
-          args: clickable build --verbose -a arm64 --app
-
-      - name: Upload the built click artifact (amd64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Axolotl-Clickable
-          path: build/aarch64-linux-gnu/app/textsecure.nanuc_*.click
-          retention-days: 1
-
-  package-click-amd64:
-    name: Package as click amd64
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Download axolotl and axolotl-web build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: build-artifacts
-
-      - name: Put axolotl web in place
-        run: |
-          mkdir $GITHUB_WORKSPACE/axolotl-web/dist
-          cp -rf build-artifacts/axolotl-web/* $GITHUB_WORKSPACE/axolotl-web/dist
-
-      - name: Build click (amd64)
-        uses: docker://clickable/ci-20.04-amd64:7.11.0
-        env:
-          GOPATH: $GITHUB_WORKSPACE/go
+      - name: Build click (${{ matrix.arch }})
+        uses: docker://clickable/ci-20.04-${{ matrix.arch }}:7.11.0
         with:
-          args: clickable build --verbose -a amd64 --app
+          args: clickable build --verbose -a ${{ matrix.arch }} --app
 
-      - name: Upload the built click artifact (amd64)
+      - name: Upload the built click artifact (${{ matrix.arch }})
         uses: actions/upload-artifact@v3
         with:
           name: Axolotl-Clickable
-          path: build/x86_64-linux-gnu/app/textsecure.nanuc_*.click
+          path: build/*/app/textsecure.nanuc_*.click
           retention-days: 1
 
   package-flatpak-web:

From 35862773c3364fad0bdf6ead5133a8103db409ec Mon Sep 17 00:00:00 2001
From: Dark Dragon <darkdragon-001@web.de>
Date: Sun, 18 Jun 2023 22:29:37 +0200
Subject: [PATCH 2/2] Apply workaround

---
 .github/workflows/package.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 9ec23ef14..90c5e1b77 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -74,9 +74,13 @@ jobs:
           cp -rf build-artifacts/axolotl-web/* $GITHUB_WORKSPACE/axolotl-web/dist
 
       - name: Build click (${{ matrix.arch }})
-        uses: docker://clickable/ci-20.04-${{ matrix.arch }}:7.11.0
+        # workaround https://github.com/actions/runner/issues/1479#issuecomment-969306629
+        uses: ChristopherHX/conditional@b4a9649204f81002ec9a4ef7d4bf7d6b2ab7fa55
         with:
-          args: clickable build --verbose -a ${{ matrix.arch }} --app
+          step: |
+            uses: docker://clickable/ci-20.04-${{ matrix.arch }}:7.11.0
+            with:
+              args: clickable build --verbose -a ${{ matrix.arch }} --app
 
       - name: Upload the built click artifact (${{ matrix.arch }})
         uses: actions/upload-artifact@v3