From 2d0b6cbe0167472db42ae71bf440a722497fc1d7 Mon Sep 17 00:00:00 2001 From: Peter Mooney <61326713+PLM1995@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:06:13 +0000 Subject: [PATCH 1/5] Add test addition to about UKCP popup (to be removed) --- src/plugin/plugin/PluginInformationMessage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugin/plugin/PluginInformationMessage.cpp b/src/plugin/plugin/PluginInformationMessage.cpp index 05bcd1343..fe8a5dc70 100644 --- a/src/plugin/plugin/PluginInformationMessage.cpp +++ b/src/plugin/plugin/PluginInformationMessage.cpp @@ -51,6 +51,7 @@ namespace UKControllerPlugin::Plugin { std::wstring message; message += L"UK Controller Plugin\r\n"; message += L"Version " + HelperFunctions::ConvertToWideString(PluginVersion::version) + L"\r\n"; + message += L"PLM Build Testing\r\n"; message += L"Copyright \xa9 " + std::to_wstring(DATE_BASE_YEAR + buf.tm_year) + L" VATSIM United Kingdom Division"; From cd01bce40667c27537640f945141d281af3ada4d Mon Sep 17 00:00:00 2001 From: Peter Mooney <61326713+PLM1995@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:17:33 +0000 Subject: [PATCH 2/5] update upload-artifact actions from v2 to v4 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9e2e8d02..084ca17f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,19 +131,19 @@ jobs: # Upload artifacts - name: Upload Core Binary As Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: UKControllerPluginCore.dll path: ".\\build\\bin\\UKControllerPluginCore.dll" - name: Upload Updater Binary As Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: UKControllerPluginUpdater.dll path: ".\\build\\bin\\UKControllerPluginUpdater.dll" - name: Upload Loader Binary As Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: UKControllerPlugin.dll path: ".\\build\\bin\\UKControllerPlugin.dll" From b98ed7363d8e901ce41ef9c4884c1032f195127a Mon Sep 17 00:00:00 2001 From: Peter Mooney <61326713+PLM1995@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:49:10 +0000 Subject: [PATCH 3/5] update actions/cache to use v4 --- .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 084ca17f0..629068a6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: # cURL - name: Cache cURL id: cache-curl - uses: actions/cache@v2.1.3 + uses: actions/cache@v4 with: path: "C:\\hostedtoolcache\\windows\\libcurl" key: "ukcp-curl-build" @@ -74,7 +74,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v1 + uses: actions/cache@v4 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -83,7 +83,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} @@ -203,7 +203,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v1 + uses: actions/cache@v4 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -212,7 +212,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} From 6ac14e86fec4e2fa0bbf685ad50a46e55335a4e6 Mon Sep 17 00:00:00 2001 From: Peter Mooney <61326713+PLM1995@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:59:13 +0000 Subject: [PATCH 4/5] change set-output to use GITHUB_OUTPUT --- .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 629068a6d..54b7f6f2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: - name: Get Yarn Cache Directory id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Load Yarn Cache uses: actions/cache@v4 @@ -200,7 +200,7 @@ jobs: - name: Get Yarn Cache Directory id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Load Yarn Cache uses: actions/cache@v4 From 77696b808f8fdbc01725c14a319c3ed4dd11e24b Mon Sep 17 00:00:00 2001 From: Peter Mooney <61326713+PLM1995@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:03:19 +0000 Subject: [PATCH 5/5] Revert "change set-output to use GITHUB_OUTPUT" This reverts commit 6ac14e86fec4e2fa0bbf685ad50a46e55335a4e6. --- .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 54b7f6f2b..629068a6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: - name: Get Yarn Cache Directory id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT + run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache uses: actions/cache@v4 @@ -200,7 +200,7 @@ jobs: - name: Get Yarn Cache Directory id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT + run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache uses: actions/cache@v4