Fix1

Author: 0x5bfa

.github/workflows/cd.yml

@@ -29,7 +29,6 @@ env:
   PACKAGE_PROJECT_DIR:        '${{ github.workspace }}\src\Files.App (Package)'
   PACKAGE_PROJECT_PATH:       '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
   PACKAGE_MANIFEST_PATH:      '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest'      
-  APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/${{ github.event.inputs.build-branch }}/'
 
 jobs:
   sideload:
@@ -38,7 +37,8 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      BRANCH: 'Sideload${{ github.event.inputs.build-branch }}' # This is either SideloadPreview or SideloadStable
+      # This is either SideloadPreview or SideloadStable
+      RELEASE_BRANCH:         'Sideload${{ github.event.inputs.build-branch }}'
 
     steps:
     - name: Checkout the repository
@@ -61,27 +61,27 @@ jobs:
     - name: Build Files
       run: |
         . './.github/scripts/Configure-AppxManifest.ps1' `
-            -Branch                    "$env:BRANCH" `
+            -Branch                    "$env:RELEASE_BRANCH" `
             -PackageManifestPath       "$env:PACKAGE_MANIFEST_PATH" `
             -WorkingDir                "$env:WORKING_DIR" `
             -Publisher                 "$env:SECRET_PUBLISHER_NAME" `
             -SecretBingMapsKey         "$env:SECRET_BINGMAPS_KEY" `
             -SecretSentry              "$env:SECRET_SENTRY" `
-            -SecretGitHubOAuthClientId "$env:SECRET_GITHUB_OAUTH_CLIENT_ID"
+            -SecretGitHubOAuthClientId "$env:SECRET_GH_OAUTH_CLIENT_ID"
         . './.github/scripts/Build-AppSolution.ps1' `
-            -Branch                    "$env:BRANCH" `
+            -Branch                    "$env:RELEASE_BRANCH" `
             -SolutionPath              "$env:SOLUTION_PATH" `
             -StartupProjectPath        "$env:PACKAGE_PROJECT_PATH" `
             -Configuration             "$env:CONFIGURATION" `
             -Platform                  "$env:PLATFORM" `
             -AppxPackageDir            "$env:APPX_PACKAGE_DIR" `
             -AppInstallerUrl           "$env:APP_INSTALLER_SIDELOAD_URL"
       env:
-        SECRET_PUBLISHER_NAME: ${{ secrets.SIDELOAD_PUBLISHER_SECRET }}
-        SECRET_BINGMAPS_KEY: ${{ secrets.BING_MAPS_SECRET }}
-        SECRET_SENTRY: ${{ secrets.SENTRY_SECRET }}
-        SECRET_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}
-        APP_INSTALLER_SIDELOAD_URL: "https://cdn.files.community/files/${{ steps.tolowercase.outputs.lowercase }}/"
+        SECRET_PUBLISHER_NAME:         ${{ secrets.SIDELOAD_PUBLISHER_SECRET }}
+        SECRET_BINGMAPS_KEY:           ${{ secrets.BING_MAPS_SECRET }}
+        SECRET_SENTRY:                 ${{ secrets.SENTRY_SECRET }}
+        SECRET_GH_OAUTH_CLIENT_ID:     ${{ secrets.GH_OAUTH_CLIENT_ID }}
+        APP_INSTALLER_SIDELOAD_URL:    "https://cdn.files.community/files/${{ steps.tolowercase.outputs.lowercase }}/"
 
     - name: Sign Files with Azure Trusted Signing
       uses: azure/[email protected]
@@ -118,16 +118,20 @@ jobs:
     - name: Upload the packages to GitHub Actions
       uses: actions/upload-artifact@v4
       with:
-        name: 'Appx Packages (${{ env.BRANCH }})'
+        name: 'Appx Packages (${{ env.RELEASE_BRANCH }})'
         path: ${{ env.ARTIFACTS_STAGING_DIR }}
 
   store:
+
+    if: ${{ github.event.inputs.publish-to-store }}
+
     runs-on: windows-latest
     environment: Deployments
     strategy:
       fail-fast: false
     env:
-      BRANCH: 'Store${{ github.event.inputs.build-branch }}' # This is either StorePreview or StoreStable
+      # This is either StorePreview or StoreStable
+      RELEASE_BRANCH:         'Store${{ github.event.inputs.build-branch }}'
 
     steps:
     - name: Checkout the repository
@@ -144,25 +148,25 @@ jobs:
     - name: Build Files
       run: |
         . './.github/scripts/Configure-AppxManifest.ps1' `
-            -Branch                    "$env:BRANCH" `
+            -Branch                    "$env:RELEASE_BRANCH" `
             -PackageManifestPath       "$env:PACKAGE_MANIFEST_PATH" `
             -WorkingDir                "$env:WORKING_DIR" `
             -Publisher                 "$env:SECRET_PUBLISHER_NAME" `
             -SecretBingMapsKey         "$env:SECRET_BINGMAPS_KEY" `
             -SecretSentry              "$env:SECRET_SENTRY" `
-            -SecretGitHubOAuthClientId "$env:SECRET_GITHUB_OAUTH_CLIENT_ID"
+            -SecretGitHubOAuthClientId "$env:SECRET_GH_OAUTH_CLIENT_ID"
         . './.github/scripts/Build-AppSolution.ps1' `
-            -Branch                    "$env:BRANCH" `
+            -Branch                    "$env:RELEASE_BRANCH" `
             -SolutionPath              "$env:SOLUTION_PATH" `
             -StartupProjectPath        "$env:PACKAGE_PROJECT_PATH" `
             -Configuration             "$env:CONFIGURATION" `
             -Platform                  "$env:PLATFORM" `
             -AppxPackageDir            "$env:APPX_PACKAGE_DIR"
       env:
-        SECRET_PUBLISHER_NAME: ${{ secrets.STORE_PUBLISHER_SECRET }}
-        SECRET_BINGMAPS_KEY: ${{ secrets.BING_MAPS_SECRET }}
-        SECRET_SENTRY: ${{ secrets.SENTRY_SECRET }}
-        SECRET_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}
+        SECRET_PUBLISHER_NAME:         ${{ secrets.STORE_PUBLISHER_SECRET }}
+        SECRET_BINGMAPS_KEY:           ${{ secrets.BING_MAPS_SECRET }}
+        SECRET_SENTRY:                 ${{ secrets.SENTRY_SECRET }}
+        SECRET_GH_OAUTH_CLIENT_ID:     ${{ secrets.GH_OAUTH_CLIENT_ID }}
 
     - name: Publish the packages to Microsoft Store
       uses: isaacrlevin/windows-store-action@1
@@ -178,5 +182,5 @@ jobs:
     - name: Upload the packages to GitHub Actions
       uses: actions/upload-artifact@v4
       with:
-        name: 'Appx Packages (${{ env.BRANCH }})'
+        name: 'Appx Packages (${{ env.RELEASE_BRANCH }})'
         path: ${{ env.ARTIFACTS_STAGING_DIR }}