From 078f33ff78f22d3ca53dc50b9c9b0e9cabd2f7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Mon, 13 May 2024 11:45:22 +0200
Subject: [PATCH] Re-add missing files (#3873)

---
 .github/workflows/main_matrix.yml      | 17 +++++++++++------
 .github/workflows/update_protobufs.yml |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 095981087..7affd8fc1 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -157,14 +157,13 @@ jobs:
         with:
           username: meshtastic
           password: ${{ secrets.DOCKER_TOKEN }}
-
       - name: Docker setup
         if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker build and push tagged versions
         if: ${{ github.event_name == 'workflow_dispatch' }}
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
@@ -173,7 +172,7 @@ jobs:
 
       - name: Docker build and push
         if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
@@ -225,6 +224,9 @@ jobs:
         run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
         id: version
 
+      - name: Move files up
+        run: mv -b -t ./ ./release/meshtasticd_linux_aarch64 ./bin/config-dist.yaml
+
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v4
         with:
@@ -236,8 +238,11 @@ jobs:
             ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
-            ./meshtasticd_linux_arm64
+            ./meshtasticd_linux_*64
             ./config-dist.yaml
+            ./littlefs-*.bin
+            ./bleota*bin
+            ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 90
 
       - uses: actions/download-artifact@v4
@@ -378,7 +383,7 @@ jobs:
           bin/bump_version.py
 
       - name: Create version.properties pull request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v6
         with:
           add-paths: |
             version.properties
diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml
index 30a5993c2..4402a280e 100644
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -26,7 +26,7 @@ jobs:
           ./bin/regen-protos.sh
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v6
         with:
           add-paths: |
             protobufs