From f907f7f21e6c3a42c9398fd4d9bc76af7b779461 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Fri, 5 Jan 2024 14:27:08 +0100
Subject: [PATCH 1/2] github: bump artifact actions

Bump the download and upload artifacts actions to v4. This will allow us
to specify the compression-level and thus reduce the duration of the
build pipeline.

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 .github/actions/build-artifact/action.yml |  2 +-
 .github/workflows/build.yml               | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/actions/build-artifact/action.yml b/.github/actions/build-artifact/action.yml
index 59a05bd..6d4b3ce 100644
--- a/.github/actions/build-artifact/action.yml
+++ b/.github/actions/build-artifact/action.yml
@@ -14,7 +14,7 @@ runs:
       shell: bash
     - run: tar -cJf "$GITHUB_WORKSPACE/build-artifact-workdir/output.tar.xz" -C ${{ inputs.gluon-path }}/output images packages debug
       shell: bash
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.hardware-target }}
         path: build-artifact-workdir
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 934cb63..1a5279e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
         run: bash .github/build-meta.sh
 
       - name: Create Artifact of build-meta
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-meta
           path: ${{ steps.build-metadata.outputs.build-meta-output }}
@@ -158,7 +158,7 @@ jobs:
           --posix -C "gluon-gha-data/gluon" openwrt
 
       - name: Archive build output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: openwrt
           path: "gluon-gha-data/openwrt"
@@ -199,7 +199,7 @@ jobs:
         run: cat /proc/meminfo
 
       - name: Download prepared OpenWrt
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: openwrt
           path: "gluon-gha-data/openwrt"
@@ -250,7 +250,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: "gluon-gha-data/gluon-output"
 
@@ -262,7 +262,7 @@ jobs:
           path: 'gluon-gha-data/gluon'
 
       - name: Download prepared OpenWrt
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: openwrt
           path: "gluon-gha-data/openwrt"
@@ -349,7 +349,7 @@ jobs:
           -C gluon-gha-data/gluon/output/images/sysupgrade -T -
 
       - name: Archive output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: manifest-signed
           path: gluon-gha-data/artifact-out
@@ -365,7 +365,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: "gluon-gha-data/artifact-download"
 
@@ -413,7 +413,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: "gluon-gha-data/artifact-download"
 

From 32039939c8fe11f541b066e3644bc583d8e167ca Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Fri, 5 Jan 2024 14:28:30 +0100
Subject: [PATCH 2/2] github: disable compression for build-output

Disable compression for the target as well as host-tools build-output.
We already compress the resulting tar archive, so we don't need to waste
more time on compressing it again.

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 .github/actions/build-artifact/action.yml | 1 +
 .github/workflows/build.yml               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/actions/build-artifact/action.yml b/.github/actions/build-artifact/action.yml
index 6d4b3ce..5104881 100644
--- a/.github/actions/build-artifact/action.yml
+++ b/.github/actions/build-artifact/action.yml
@@ -18,5 +18,6 @@ runs:
       with:
         name: ${{ inputs.hardware-target }}
         path: build-artifact-workdir
+        compression-level: 0
     - run: rm -rf "$GITHUB_WORKSPACE/build-artifact-workdir"
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a5279e..a72f47a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -162,6 +162,7 @@ jobs:
         with:
           name: openwrt
           path: "gluon-gha-data/openwrt"
+          compression-level: 0
 
 
   build: