From f1fb8b0f65fb6bea00edead43be9d9a1d96086d1 Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Thu, 19 Oct 2023 16:45:03 +0200
Subject: [PATCH] workflows bugfix install latest TinyORM port

Install the latest TinyORM port also for vcpkg classic mode.
---
 .github/workflows/vcpkg-linux.yml   | 29 ++++++++++++++++-------------
 .github/workflows/vcpkg-windows.yml | 25 ++++++++++++++-----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
index 4fed3bebd..17f86159a 100644
--- a/.github/workflows/vcpkg-linux.yml
+++ b/.github/workflows/vcpkg-linux.yml
@@ -137,6 +137,22 @@ jobs:
       run: |
         sqlite3 --version
 
+    # Will be used in the classic method (vcpkg install tinyorm) and VcpkgManifest method
+    # I will not write bash scripts for this, would be a pain 🫤
+    - name: vcpkg prepare TinyORM ports (update REF and SHA512)
+      shell: pwsh -NoProfile -Command "& '{0}'"
+      working-directory: ${{ env.TinyORMPath }}
+      run: |
+        . ./tools/private/Common-Deploy.ps1
+
+        $portfileQt6Path = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm/portfile.cmake'
+        $portfileQt5Path = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake'
+        $vcpkgRef = '${{ github.ref_name }}'
+
+        Edit-VcpkgRefAndHash -Project 'silverqx/TinyORM' -Ref $vcpkgRef `
+        -PortFile $portfileQt6Path, $portfileQt5Path `
+        -EnableRetries
+
     # The following two steps (vcpkg install) are not needed below they only test if the vcpkg
     # classic mode works correctly. The Release and Debug build types are build at once so invoke
     # these two steps for the debug matrix only.
@@ -202,19 +218,6 @@ jobs:
       run: |
         cp ./vcpkg.json.VcpkgManifest.${{ matrix.qt.name }}.example ./vcpkg.json
 
-    # I will not write bash scripts for this, would be a pain 🫤
-    - name: HelloWorld prepare VcpkgManifest method (update REF and SHA512)
-      shell: pwsh -NoProfile -Command "& '{0}'"
-      working-directory: ${{ env.TinyORMPath }}
-      run: |
-        . ./tools/private/Common-Deploy.ps1
-
-        $portfilePath = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm/portfile.cmake'
-        $vcpkgRef = '${{ github.ref_name }}'
-
-        Edit-VcpkgRefAndHash -Project 'silverqx/TinyORM' -Ref $vcpkgRef -PortFile $portfilePath `
-        -EnableRetries
-
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (no need to use PCH for one TU)
     # VCPKG_APPLOCAL_DEPS=OFF is correct as everything is linked statically on Linux
     # Don't use ccache for the VcpkgManifest method as the vcpkg has its own binary caching
diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml
index e2e160048..e3706564c 100644
--- a/.github/workflows/vcpkg-windows.yml
+++ b/.github/workflows/vcpkg-windows.yml
@@ -121,6 +121,20 @@ jobs:
       run: |
         cmake.exe --version
 
+    # Will be used in the classic method (vcpkg install tinyorm) and VcpkgManifest method
+    - name: vcpkg prepare TinyORM ports (update REF and SHA512)
+      working-directory: ${{ env.TinyORMPath }}
+      run: |
+        . ./tools/private/Common-Deploy.ps1
+
+        $portfileQt6Path = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm/portfile.cmake'
+        $portfileQt5Path = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake'
+        $vcpkgRef = '${{ github.ref_name }}'
+
+        Edit-VcpkgRefAndHash -Project 'silverqx/TinyORM' -Ref $vcpkgRef `
+        -PortFile $portfileQt6Path, $portfileQt5Path `
+        -EnableRetries
+
     # The following two steps (vcpkg install) are not needed below they only test if the vcpkg
     # classic mode works correctly. The Release and Debug build types are build at once so invoke
     # these two steps for the debug matrix only.
@@ -195,17 +209,6 @@ jobs:
         Copy-Item -Path ./vcpkg.json.VcpkgManifest.${{ matrix.qt.name }}.example
         -Destination ./vcpkg.json
 
-    - name: HelloWorld prepare VcpkgManifest method (update REF and SHA512)
-      working-directory: ${{ env.TinyORMPath }}
-      run: |
-        . ./tools/private/Common-Deploy.ps1
-
-        $portfilePath = Resolve-Path -Path './cmake/vcpkg/ports/tinyorm/portfile.cmake'
-        $vcpkgRef = '${{ github.ref_name }}'
-
-        Edit-VcpkgRefAndHash -Project 'silverqx/TinyORM' -Ref $vcpkgRef -PortFile $portfilePath `
-        -EnableRetries
-
     # Don't use ccache for the VcpkgManifest method as the vcpkg has its own binary caching
     - name: HelloWorld cmake configure (vcpkgmanifest-msvc-${{ matrix.build-type.key }})
       working-directory: HelloWorld