From 6e4b755a107e3e6d0374f87ce5c0c3524b35b20b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 5 Mar 2023 20:37:23 +0100 Subject: [PATCH 01/16] upload artifacts --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e44b92cb..593e05e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,3 +42,6 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/d/a/_temp/msys/msys64/mingw64/qt5-static/lib/cmake/Qt5Widgets .. make + + - name: Step 3 - Use the Upload Artifact GitHub Action + uses: actions/upload-artifact@v2 From e41713982f1e3e67c9cbbe63bd6ee64914899ad3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 5 Mar 2023 20:42:18 +0100 Subject: [PATCH 02/16] fix CI --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 593e05e4..01887f4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,8 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt -y install build-essential cmake zlib1g-dev libgl1-mesa-dev libgl1-mesa-glx libusb-1.0-0-dev qt5-default + sudo apt -y install build-essential cmake zlib1g-dev libgl1-mesa-dev libgl1-mesa-glx libusb-1.0-0-dev qtbase5-dev + - name: Build run: | mkdir build @@ -29,11 +30,11 @@ jobs: update: true install: >- make - mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5-static + - name: Build shell: msys2 {0} run: | @@ -43,5 +44,5 @@ jobs: cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/d/a/_temp/msys/msys64/mingw64/qt5-static/lib/cmake/Qt5Widgets .. make - - name: Step 3 - Use the Upload Artifact GitHub Action + - name: Upload Artifacts uses: actions/upload-artifact@v2 From a5500ec5375769c8a9ec1db24c5ea50cbc2e8179 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 5 Mar 2023 20:45:02 +0100 Subject: [PATCH 03/16] also upload linux artifacts --- .github/workflows/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01887f4f..038428c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,12 @@ jobs: cmake -DCMAKE_BUILD_TYPE=Release .. make + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: linux + path: ./bin + win-build: runs-on: windows-latest @@ -45,4 +51,7 @@ jobs: make - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 + with: + name: windows + path: ./bin From 05a73670d56485e730dfc636a7b2b306df788835 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 5 Mar 2023 20:48:59 +0100 Subject: [PATCH 04/16] what the hell happened here --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 038428c9..d85e3f6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: linux - path: ./bin + path: ./ win-build: runs-on: windows-latest @@ -54,4 +54,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: windows - path: ./bin + path: ./ From 5054f540917de45851fab53b3f9bde17bc4efefa Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:20:22 +0200 Subject: [PATCH 05/16] install qt5 base --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d85e3f6a..ef723461 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-libusb - mingw-w64-x86_64-qt5-static + mingw-w64-x86_64-qt5-base - name: Build shell: msys2 {0} From 99cccce74da3af609d1271c71dcdf1df03af786a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:30:53 +0200 Subject: [PATCH 06/16] pack binaries only --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef723461..e42d35a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,13 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release .. make + cp ./Linux/README.txt ./build/bin/ - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: linux - path: ./ + path: ./build/bin/ win-build: runs-on: windows-latest @@ -49,9 +50,12 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/d/a/_temp/msys/msys64/mingw64/qt5-static/lib/cmake/Qt5Widgets .. make + mkdir ./build/bin/Drivers/ + cp ./Win32/README.txt ./build/bin/ + cp ./Win32/Drivers/zadig.exe ./build/bin/Drivers/ - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: windows - path: ./ + path: ./build/bin/ From 33ba0c0bf57849e1cb2243eecb3796a7403571bc Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:33:03 +0200 Subject: [PATCH 07/16] minor spelling mistake .txt on readme --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e42d35a2..06431d50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release .. make - cp ./Linux/README.txt ./build/bin/ + cp ./Linux/README ./build/bin/ - name: Upload Artifacts uses: actions/upload-artifact@v3 From 02149711b17ce4289ecb43ae9a82e8cd9f88425a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:34:21 +0200 Subject: [PATCH 08/16] widget path is no longer required --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06431d50..d9baf71e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: export PATH="/mingw64/bin:$PATH" mkdir build cd build - cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/d/a/_temp/msys/msys64/mingw64/qt5-static/lib/cmake/Qt5Widgets .. + cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make mkdir ./build/bin/Drivers/ cp ./Win32/README.txt ./build/bin/ From bd1942d468d6b4bcf3c2ef5ea85ded56b804c5c0 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:40:25 +0200 Subject: [PATCH 09/16] forgot to change dirs after make --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9baf71e..0c327ab1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release .. make + cd .. cp ./Linux/README ./build/bin/ - name: Upload Artifacts @@ -50,6 +51,7 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make + cd .. mkdir ./build/bin/Drivers/ cp ./Win32/README.txt ./build/bin/ cp ./Win32/Drivers/zadig.exe ./build/bin/Drivers/ From ee595e295ef2797997d756bf4af76038800b2039 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:49:32 +0200 Subject: [PATCH 10/16] deploy DLLs --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c327ab1..93323228 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make + windeployqt heimdall-frontend.exe cd .. mkdir ./build/bin/Drivers/ cp ./Win32/README.txt ./build/bin/ From ce9241af8bac871137db7b3e7ab373450e9d0392 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:55:03 +0200 Subject: [PATCH 11/16] deploy mistake --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93323228..ea12aa8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,7 @@ jobs: mingw-w64-x86_64-cmake mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5-base + mingw-w64-x86_64-qt5-tools - name: Build shell: msys2 {0} @@ -51,7 +52,7 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make - windeployqt heimdall-frontend.exe + windeployqt.exe heimdall-frontend.exe cd .. mkdir ./build/bin/Drivers/ cp ./Win32/README.txt ./build/bin/ From 6550830289d0da18db9f035eaee4bb8882c5ffed Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:56:09 +0200 Subject: [PATCH 12/16] reinstall static qt5 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea12aa8a..45a36f16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,7 @@ jobs: mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5-base mingw-w64-x86_64-qt5-tools + mingw-w64-qt5-static - name: Build shell: msys2 {0} From 315b86e0536b3eccd51cc3b2473a3178bb5bdc3a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:58:00 +0200 Subject: [PATCH 13/16] binary please --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45a36f16..ab92973a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,8 +42,8 @@ jobs: mingw-w64-x86_64-cmake mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5-base - mingw-w64-x86_64-qt5-tools - mingw-w64-qt5-static + mingw-w64-x86_64-qt5-static + mingw-w64-x86_64-qt5-tools - name: Build shell: msys2 {0} From 4b3ad4e427eefe14667d80e228e65d90c4b9fde8 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 3 May 2023 10:59:29 +0200 Subject: [PATCH 14/16] bins are in bin folder --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab92973a..a8d22a4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,8 +53,10 @@ jobs: cd build cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make + cd bin windeployqt.exe heimdall-frontend.exe cd .. + cd .. mkdir ./build/bin/Drivers/ cp ./Win32/README.txt ./build/bin/ cp ./Win32/Drivers/zadig.exe ./build/bin/Drivers/ From 9429ee7707a64e58108113e9cb575707239c68ac Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 17 Aug 2024 14:00:05 +0200 Subject: [PATCH 15/16] allow manual build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8d22a4c..9c1f657f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: build -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: linux-build: From d77bd26878235388fdb6f5f78223aead418fdaae Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 17 Aug 2024 14:07:51 +0200 Subject: [PATCH 16/16] no gl --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c1f657f..8e403354 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt update @@ -23,7 +23,7 @@ jobs: cp ./Linux/README ./build/bin/ - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux path: ./build/bin/ @@ -32,7 +32,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 with: update: true @@ -54,7 +54,7 @@ jobs: cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. make cd bin - windeployqt.exe heimdall-frontend.exe + windeployqt.exe --no-angle heimdall-frontend.exe cd .. cd .. mkdir ./build/bin/Drivers/ @@ -62,7 +62,7 @@ jobs: cp ./Win32/Drivers/zadig.exe ./build/bin/Drivers/ - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows path: ./build/bin/