From c3d9060d3832a63c3659c386b5ebcaedaab4d70b Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Thu, 28 Jan 2021 22:57:32 -0800 Subject: [PATCH 1/5] Fix parameter type mismatch --- Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h index e17cc55e9c..925273cece 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h @@ -350,7 +350,7 @@ void NetCliAuthAgeRequest ( //============================================================================ void NetCliAuthGetEncryptionKey ( uint32_t key[], - unsigned size + size_t size ); //============================================================================ From 1bf498353828d8c51fe0c859f9ce886afc045ab8 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Thu, 28 Jan 2021 23:09:34 -0800 Subject: [PATCH 2/5] Set up CI for Windows 64-bit This is primarily so that the GitHub NuGet cache will be populated with 64-bit versions of the vcpkg packages. We are not expecting 64-bit client builds to work, and we are deliberately not saving them as artifacts. --- .github/workflows/windows-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 47340523a3..dc18fa5cf4 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -8,6 +8,7 @@ jobs: matrix: platform: - { generator: Visual Studio 16 2019, arch: Win32, qt-arch: win32_msvc2019, qt-version: 5.15.2, str: windows-x86 } + - { generator: Visual Studio 16 2019, arch: Win64, qt-arch: win64_msvc2019, qt-version: 5.15.2, str: windows-x64 } cfg: - { external: OFF, type: RelWithDebInfo, str: internal-release } - { external: OFF, type: Debug, str: internal-debug } @@ -52,6 +53,7 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v2 + if: ${{ matrix.arch == 'Win32' }} with: name: plasma-${{ matrix.platform.str }}-${{ matrix.cfg.str }} path: build/install From 5527b48511c0ad2321ff00b153b51bf59a4725f0 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Thu, 28 Jan 2021 23:15:28 -0800 Subject: [PATCH 3/5] Apparently it's `x64` not `Win64` --- .github/workflows/windows-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index dc18fa5cf4..c6096353ce 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -8,7 +8,7 @@ jobs: matrix: platform: - { generator: Visual Studio 16 2019, arch: Win32, qt-arch: win32_msvc2019, qt-version: 5.15.2, str: windows-x86 } - - { generator: Visual Studio 16 2019, arch: Win64, qt-arch: win64_msvc2019, qt-version: 5.15.2, str: windows-x64 } + - { generator: Visual Studio 16 2019, arch: x64, qt-arch: win64_msvc2019, qt-version: 5.15.2, str: windows-x64 } cfg: - { external: OFF, type: RelWithDebInfo, str: internal-release } - { external: OFF, type: Debug, str: internal-debug } From fe384728986689c4bd8bf8e5e1e277af28b85442 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 29 Jan 2021 00:07:52 -0800 Subject: [PATCH 4/5] Fix typo in FindVLD.cmake --- cmake/FindVLD.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindVLD.cmake b/cmake/FindVLD.cmake index a3ef90e00d..bd9f106645 100644 --- a/cmake/FindVLD.cmake +++ b/cmake/FindVLD.cmake @@ -13,7 +13,7 @@ if(MSVC) if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) set(_VLD_LIB "Win32") - elseif(${CMAKE_SIZEOF_VOIDP} EQUAL 8) + elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8) set(_VLD_LIB "Win64") endif() From d451c6c07b530e164de9bf9ada256042dffc03c0 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 29 Jan 2021 00:24:03 -0800 Subject: [PATCH 5/5] Fix Windows 64-bit Qt installation in CI --- .github/workflows/windows-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index c6096353ce..8b21c8c05e 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -4,11 +4,12 @@ on: [push, pull_request] jobs: build: runs-on: windows-latest + name: ${{ matrix.platform.str }}-${{ matrix.cfg.str }} strategy: matrix: platform: - { generator: Visual Studio 16 2019, arch: Win32, qt-arch: win32_msvc2019, qt-version: 5.15.2, str: windows-x86 } - - { generator: Visual Studio 16 2019, arch: x64, qt-arch: win64_msvc2019, qt-version: 5.15.2, str: windows-x64 } + - { generator: Visual Studio 16 2019, arch: x64, qt-arch: win64_msvc2019_64, qt-version: 5.15.2, str: windows-x64 } cfg: - { external: OFF, type: RelWithDebInfo, str: internal-release } - { external: OFF, type: Debug, str: internal-debug }