update to new release ci

Author: AnakinRaW

.github/workflows/integration-test.yml

@@ -12,38 +12,34 @@ on:
         required: true
 
 env:
-  TOOL_PROJ_PATH: ./src/ModVerify.CliApp/ModVerify.CliApp.csproj
-  PUBLISH_SCRIPT: ./modules/ModdingToolBase/scripts/Publish-Release.ps1
-  TOOL_EXE: ModVerify.exe
-  UPDATER_EXE: AnakinRaW.ExternalUpdater.exe
-  EMBEDDED_TRUST_CERT: src/ModVerify.CliApp/Resources/Certs/AET-root.cer
-  ORIGIN_BASE: https://republicatwar.com/downloads/ModVerify
-  SFTP_BASE_PATH: downloads/ModVerify/
+  # Per-run release channel. Every other per-app value lives in update-tooling.jsonc and is loaded
+  # into the environment by the "Load app config" step in each job below.
   BRANCH_NAME: ${{ github.event.inputs.branch || 'stable' }}
 
-  # Migration-release values. Leave empty for a normal release; populate to enable.
-  #
-  # Origin URL of the next-generation channel, written into the manifest's componentOriginInfo.
-  NEXT_ORIGIN_BASE: https://republicatwar.com/downloads/ModVerify/v2
-
-  # SFTP path the next-generation channel uploads to. Set together with NEXT_ORIGIN_BASE.
-  NEXT_SFTP_BASE_PATH: downloads/ModVerify/v2/
-
-  # Previously-deployed updater used in place of the build-output one for the primary deploy.
-  # Only the old-gen manifest lists this binary; the next-gen manifest still uses the build-output updater.
-  # Requires NEXT_ORIGIN_BASE + NEXT_SFTP_BASE_PATH to be set.
-  COMPAT_UPDATER: tools/v1/AnakinRaW.ExternalUpdater.exe
-
 jobs:
 
 # Builds and tests the solution.
   test:
     uses: ./.github/workflows/test.yml
 
-  # End-to-end self-update test (single-channel + dual-channel via /v2/).
+  # End-to-end self-update test.
   integration-test:
+    name: Integration test
     needs: [test]
-    uses: ./.github/workflows/integration-test.yml
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 10.0.x
+      - name: Run self-update integration suite
+        shell: pwsh
+        run: |
+          $c = Get-Content -Raw ./update-tooling.jsonc | ConvertFrom-Json
+          & "$($c.scriptsDir)/Test-LocalUpdateSuite.ps1" -ConfigPath ./update-tooling.jsonc
 
   pack:
     name: Pack
@@ -55,6 +51,11 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
+      - name: Load app config
+        shell: pwsh
+        run: |
+          $c = Get-Content -Raw ./update-tooling.jsonc | ConvertFrom-Json
+          "TOOL_PROJ_PATH=$($c.toolProject)" >> $env:GITHUB_ENV
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
       - name: Create NetFramework Release
@@ -97,6 +98,23 @@ jobs:
         with:
             dotnet-version: 10.0.x
 
+      - name: Load app config
+        shell: pwsh
+        # Per-app release values come from update-tooling.jsonc.
+        run: |
+          $c = Get-Content -Raw ./update-tooling.jsonc | ConvertFrom-Json
+          "PUBLISH_SCRIPT=$($c.scriptsDir)/Publish-Release.ps1" >> $env:GITHUB_ENV
+          "TOOL_EXE=$($c.appExe)"                       >> $env:GITHUB_ENV
+          "UPDATER_EXE=$($c.updaterExe)"                >> $env:GITHUB_ENV
+          "EMBEDDED_TRUST_CERT=$($c.embeddedTrustCert)" >> $env:GITHUB_ENV
+          "ORIGIN_BASE=$($c.origin)"                    >> $env:GITHUB_ENV
+          "SFTP_BASE_PATH=$($c.sftpBasePath)"           >> $env:GITHUB_ENV
+          "SFTP_HOST=$($c.sftpHost)"                    >> $env:GITHUB_ENV
+          "SFTP_PORT=$($c.sftpPort)"                    >> $env:GITHUB_ENV
+          "NEXT_ORIGIN_BASE=$($c.nextOrigin)"           >> $env:GITHUB_ENV
+          "NEXT_SFTP_BASE_PATH=$($c.nextSftpBasePath)"  >> $env:GITHUB_ENV
+          "COMPAT_UPDATER=$($c.compatUpdater)"          >> $env:GITHUB_ENV
+
       - name: Publish self-update release
         shell: pwsh
         run: |
@@ -135,5 +153,5 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           generate_release_notes: true
           files: |
-            ./releases/net481/ModVerify.exe
+            ./releases/net481/${{ env.TOOL_EXE }}
             ./releases/ModVerify-Net10.zip

.github/workflows/release.yml

@@ -42,4 +42,21 @@ jobs:
         dotnet build --configuration Release
         for proj in $(find . -name '*.Test.csproj' -not -path '*/ExternalUpdater.App.Test/*'); do
           dotnet test "$proj" --no-build --configuration Release --report-github
-        done
+        done
+
+  test-moddingtoolbase:
+    name: Test ModdingToolBase
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 10.0.x
+      - name: Test ModdingToolBase (submodule)
+        shell: pwsh
+        run: |
+          $c = Get-Content -Raw ./update-tooling.jsonc | ConvertFrom-Json
+          & "$($c.scriptsDir)/Test-ModdingToolBase.ps1"

.github/workflows/test.yml

@@ -0,0 +1,40 @@
+// Per-app configuration for the shared ModdingToolBase release/deploy tooling.
+// Consumed by ModdingToolBase/scripts/*.ps1 (local dev/test) and by .github/workflows/release.yml (CI).
+//
+// Parsed only with PowerShell's ConvertFrom-Json, which tolerates // and /* */ comments and
+// trailing commas. Keep it that way: don't point a strict JSON validator at this file.
+{
+  // ===== SHARED -- consumed by BOTH dev/test (local scripts) and prod (release.yml CI) =======
+  "toolProject": "./src/ModVerify.CliApp/ModVerify.CliApp.csproj", // app csproj to build
+  "appExe": "ModVerify.exe", // built app exe name
+  "updaterExe": "AnakinRaW.ExternalUpdater.exe", // external updater exe name
+  "scriptsDir": "./modules/ModdingToolBase/scripts", // ModdingToolBase scripts dir (its submodule path)
+
+  // ===== DEV/TEST ONLY -- the local self-update test scripts; never used by a prod release ===
+  // testUpdateBranch: the update-server channel the local test publishes to and reads from
+  // (feeds --updateBranch). It's an update channel, NOT a git branch; prod uses "stable"
+  // (set in release.yml's BRANCH_NAME). Note what is NOT here:
+  //   - targetFramework: fixed at net481 by the tooling (external updater is net481-only),
+  //                      so it's a Build-LocalRelease.ps1 default, not a per-app value.
+  //   - noUpdateMessage: the test now asserts the re-check exits 0 and leaves the exe version
+  //                      unchanged, instead of scraping a host-specific console string.
+  "testUpdateBranch": "beta",
+  "appLogDir": "ModVerify", // %APPDATA% subfolder with the app log (failure diagnostics)
+
+  // ===== PROD / RELEASE ONLY -- published by release.yml (CI); unused by the local test ======
+  "embeddedTrustCert": "src/ModVerify.CliApp/Resources/Certs/AET-root.cer", // public trust .cer shipped in the app
+  "origin": "https://republicatwar.com/downloads/ModVerify", // manifest origin URL
+  "sftpBasePath": "downloads/ModVerify", // SFTP upload base path
+  "sftpHost": "republicatwar.com",
+  "sftpPort": 1579,
+
+  // Migration release (cross-API). Leave all three empty for a normal release; populate them to
+  // publish a next-generation channel alongside the current one. See Publish-Release.ps1.
+  //   nextOrigin       - origin URL of the next-gen channel
+  //   nextSftpBasePath - SFTP base path for the next-gen channel (set together with nextOrigin)
+  //   compatUpdater    - previous-gen updater used for the PRIMARY deploy during the cutover
+  //                      (only valid when nextOrigin + nextSftpBasePath are set)
+  "nextOrigin": "https://republicatwar.com/downloads/ModVerify/v2",
+  "nextSftpBasePath": "downloads/ModVerify/v2",
+  "compatUpdater": "tools/v1/AnakinRaW.ExternalUpdater.exe"
+}