From bbc8b573397820faf4402f197190ca2a499a18ce Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Tue, 17 Jun 2025 11:58:32 -0400 Subject: [PATCH 1/2] Fix CI --- .github/workflows/wf-build-release-ci.yml | 6 +++--- .github/workflows/wf-build-release.yml | 6 +++--- .github/workflows/wf-build-test.yml | 4 ++-- .github/workflows/wf-verify-formatting.yml | 10 ++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/wf-build-release-ci.yml b/.github/workflows/wf-build-release-ci.yml index 124e9b18..552f2e78 100644 --- a/.github/workflows/wf-build-release-ci.yml +++ b/.github/workflows/wf-build-release-ci.yml @@ -33,7 +33,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} test: needs: build @@ -43,7 +43,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 @@ -147,7 +147,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 diff --git a/.github/workflows/wf-build-release.yml b/.github/workflows/wf-build-release.yml index 1b898d11..1879212f 100644 --- a/.github/workflows/wf-build-release.yml +++ b/.github/workflows/wf-build-release.yml @@ -34,7 +34,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} test: needs: build @@ -44,7 +44,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 @@ -147,7 +147,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 diff --git a/.github/workflows/wf-build-test.yml b/.github/workflows/wf-build-test.yml index eca43ce8..5597ba90 100644 --- a/.github/workflows/wf-build-test.yml +++ b/.github/workflows/wf-build-test.yml @@ -33,7 +33,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} test: needs: build @@ -43,7 +43,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Compiled project - path: D:\a\qrcoder\qrcoder + path: ${{ github.workspace }} - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 diff --git a/.github/workflows/wf-verify-formatting.yml b/.github/workflows/wf-verify-formatting.yml index acc21c54..3dbb788e 100644 --- a/.github/workflows/wf-verify-formatting.yml +++ b/.github/workflows/wf-verify-formatting.yml @@ -7,7 +7,9 @@ on: jobs: format: - runs-on: windows-2019 + runs-on: ubuntu-latest + env: + EnableWindowsTargeting: true steps: - uses: actions/checkout@v4 name: Checkout Code @@ -15,11 +17,7 @@ jobs: - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 2.0.x - 5.0.x - 6.0.x - 8.0.x + dotnet-version: 8.0.x - name: Restore NuGet Packages run: dotnet restore From b586d66324589cc475fed8a9812ccee1023c4773 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Tue, 17 Jun 2025 12:01:16 -0400 Subject: [PATCH 2/2] update --- .github/workflows/wf-build-release-ci.yml | 8 ++++---- .github/workflows/wf-build-release.yml | 8 ++++---- .github/workflows/wf-build-test.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/wf-build-release-ci.yml b/.github/workflows/wf-build-release-ci.yml index 552f2e78..8bf0c577 100644 --- a/.github/workflows/wf-build-release-ci.yml +++ b/.github/workflows/wf-build-release-ci.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: jobs: build: - runs-on: windows-2019 + runs-on: windows-latest env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: @@ -37,7 +37,7 @@ jobs: test: needs: build - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Download artifacts uses: actions/download-artifact@v4 @@ -139,7 +139,7 @@ jobs: pack-push-ci: needs: test - runs-on: windows-2019 + runs-on: windows-latest env: GH_PKG_SEC: ${{ secrets.GITHUB_TOKEN }} steps: @@ -193,7 +193,7 @@ jobs: clean: needs: [build, test, pack-push-ci] if: always() - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Delete artifacts uses: GeekyEggo/delete-artifact@v5 diff --git a/.github/workflows/wf-build-release.yml b/.github/workflows/wf-build-release.yml index 1879212f..ad7a5f21 100644 --- a/.github/workflows/wf-build-release.yml +++ b/.github/workflows/wf-build-release.yml @@ -7,7 +7,7 @@ on: required: true jobs: build: - runs-on: windows-2019 + runs-on: windows-latest env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: @@ -38,7 +38,7 @@ jobs: test: needs: build - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Download artifacts uses: actions/download-artifact@v4 @@ -139,7 +139,7 @@ jobs: pack-push-release: needs: test - runs-on: windows-2019 + runs-on: windows-latest env: GH_PKG_SEC: ${{ secrets.GITHUB_TOKEN }} steps: @@ -187,7 +187,7 @@ jobs: clean: needs: [build, test, pack-push-release] if: always() - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Delete artifacts uses: GeekyEggo/delete-artifact@v5 diff --git a/.github/workflows/wf-build-test.yml b/.github/workflows/wf-build-test.yml index 5597ba90..64cc56d3 100644 --- a/.github/workflows/wf-build-test.yml +++ b/.github/workflows/wf-build-test.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: jobs: build: - runs-on: windows-2019 + runs-on: windows-latest env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: @@ -37,7 +37,7 @@ jobs: test: needs: build - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Download artifacts uses: actions/download-artifact@v4 @@ -98,7 +98,7 @@ jobs: clean: needs: [build, test] if: always() - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Delete artifacts uses: GeekyEggo/delete-artifact@v5