From 4414e60d25ccbe823576fd2e904b020db6f7dcba Mon Sep 17 00:00:00 2001
From: Patrick Siegler <github@psieg.de>
Date: Sat, 10 Feb 2024 13:16:05 +0100
Subject: [PATCH] Update to Qt6 and OpenSSL 3

---
 .github/workflows/ci.yml | 26 +++++++++++++-------------
 Software/UpdateElevate   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cded5abc..428004a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     name: pacman Build (Arch Linux)
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build
         working-directory: Software/dist_linux
         run: ./build-in-docker.sh pacman archlinux latest
@@ -25,7 +25,7 @@ jobs:
           echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
           echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
       - name: Upload Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
@@ -35,7 +35,7 @@ jobs:
     name: Flatpack Build
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Flatpak
         run: |
           set -xe
@@ -52,7 +52,7 @@ jobs:
           echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
           echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
       - name: Upload Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
@@ -65,7 +65,7 @@ jobs:
     name: dpkg Build (${{ matrix.os }})
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build
         working-directory: Software/dist_linux
         run: ./build-in-docker.sh dpkg ${{ matrix.os }}
@@ -76,7 +76,7 @@ jobs:
           echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
           echo "PKG_NAME=$(basename $PKG_PATH | sed 's#amd64#${{ matrix.os }}_amd64#; s# ##')" >> $GITHUB_ENV
       - name: Upload Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
@@ -85,13 +85,13 @@ jobs:
     name: Firmware Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
       - run: sudo apt-get install gcc-avr avr-libc build-essential
       - run: ./build_batch.sh
         working-directory: ./Firmware
       - name: Archive artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: firmware
           path: Firmware/hex/*
@@ -100,7 +100,7 @@ jobs:
     name: Windows Build
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - run: choco install --no-progress openssl
@@ -110,7 +110,7 @@ jobs:
         with:
           cache: true
           cache-key-prefix: install-qt-action-default
-          version: 5.*
+          version: >=6.6 <7
       - name: Cached Bass
         id: cache-bass
         uses: actions/cache@v2
@@ -175,7 +175,7 @@ jobs:
           echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
           echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
       - name: Upload Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
@@ -186,7 +186,7 @@ jobs:
     env:
       QT_DEST: Qt
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Select Latest Xcode
         run: |
           set -xe
@@ -242,7 +242,7 @@ jobs:
           echo "PKG_PATH=$PKG_PATH" >> $GITHUB_ENV
           echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
       - name: Upload Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
diff --git a/Software/UpdateElevate b/Software/UpdateElevate
index 5b6333aa..75a3e3e1 160000
--- a/Software/UpdateElevate
+++ b/Software/UpdateElevate
@@ -1 +1 @@
-Subproject commit 5b6333aabf1cdbb7cf0b8b8957ea38aa4ba62181
+Subproject commit 75a3e3e184cbad27c499fcdd5a8e852f0f93316d