Update main_build-maui_release.yml

LanceMcCarthy · LanceMcCarthy · commit 3e7230e5a203 · 2024-12-13T18:55:55.000-05:00
diff --git a/.github/workflows/main_build-maui_release.yml b/.github/workflows/main_build-maui_release.yml
@@ -94,44 +94,21 @@ jobs:
     - name: Build WinUI win10-x64
       run: dotnet publish ${{env.CSPROJ_PATH}} -f "${{env.WINUI_TFM}}" -p:RuntimeIdentifierOverride="win10-x64" -p:PublishTrimmed=False -p:GenerateAppxPackageOnBuild=true -p:AppxPackageSigningEnabled=false -p:EnableMsixTooling=true --self-contained=true
 
-      # Compile and publish the WinUI ARM64 project for the Microsoft Store (no code signing for store builds, Microsoft signs it)
-    - name: Build WinUI win10-arm64
-      run: dotnet publish ${{env.CSPROJ_PATH}} -f "${{env.WINUI_TFM}}" -p:RuntimeIdentifierOverride="win10-arm64" -p:PublishTrimmed=False -p:GenerateAppxPackageOnBuild=true -p:AppxPackageSigningEnabled=false -p:EnableMsixTooling=true --self-contained=true
-
     # Find the msix file
-    - name: Generate msixbundle
-      id: generate-msixbundle
+    - name: Locate msix
+      id: find-msix-file
       run: |
-        # 1. Add MakeAppx to the PATH
-        $sdkToolsPath = Join-Path -Path 'C:\Program Files (x86)\Windows Kits\10\bin' -ChildPath 10.0.22621.0 -AdditionalChildPath x86
-        $env:Path += ";$sdkToolsPath"
-        
-        # 2. Create the artifacts folder and copy msix files
-        New-Item -Path . -Name ${{env.WINDOWS_ARTIFACTS_PATH}} -ItemType Directory
-
-        Copy-Item ${{github.workspace}}\src\MAUI\bin\Release\net9.0-windows10.0.22621.0\win10-x64\AppPackages\${{needs.shared-resources.outputs.app_version}}_Test\MauiDemo_${{needs.shared-resources.outputs.app_version}}.0_x64.msix -Destination ${{env.WINDOWS_ARTIFACTS_PATH}}
-
-        Copy-Item ${{github.workspace}}\src\MAUI\bin\Release\net9.0-windows10.0.22621.0\win10-arm64\AppPackages\${{needs.shared-resources.outputs.app_version}}_Test\MauiDemo_${{needs.shared-resources.outputs.app_version}}.0_arm64.msix -Destination ${{env.WINDOWS_ARTIFACTS_PATH}}
-
-        # 4. Change directory to the artifacts folder
-        Set-Location ${{env.WINDOWS_ARTIFACTS_PATH}}
-
-        $bundleFilePath="MauiDemo_v${{needs.shared-resources.outputs.app_version}}_x64_arm64_MsftStoreOnly.msixbundle"
-
-        # 5. Create the msixbundle using all the msix files inside the artifacts folder
-        MakeAppx.exe bundle /bv "${{needs.shared-resources.outputs.app_version}}" /d . /p $bundleFilePath
-
-        # 6. Export the bundle path
-        echo "msixbundle_path=$bundleFilePath" >> $env:GITHUB_OUTPUT
+        $msixPath = Get-ChildItem -Filter MauiDemo*.msix -Recurse | %{$_.FullName}
+        echo "PACKAGE_PATH=$msixPath" >> $env:GITHUB_OUTPUT
 
-    # Attaching the msixbundle as an artifact
+    # Attaching the asset to workflow run
     - name: Attach artifacts
       uses: actions/upload-artifact@v4
       with:     
-        name: "MauiDemo_v${{needs.shared-resources.outputs.app_version}}_x64_arm64_MsftStoreOnly.msixbundle" 
-        path: ${{steps.generate-msixbundle.outputs.msixbundle_path}}
+        name: "MauiDemo_v${{needs.shared-resources.outputs.app_version}}_MsftStoreOnly.msix" 
+        path: ${{steps.find-msix-file.outputs.PACKAGE_PATH}}
         if-no-files-found: error
-        retention-days: 10
+        retention-days: 30
 
 
   # ************************************** #
@@ -144,7 +121,7 @@ jobs:
     if: ${{ needs.shared-resources.outputs.app_version != ''}}
     strategy:
       matrix:
-        RID: [win10-arm64, win10-x64]
+        RID: [win10-x64]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -227,17 +204,6 @@ jobs:
         if-no-files-found: error
         retention-days: 30
 
-    - name: Attach asset to GitHub Release
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      with:
-        upload_url: ${{needs.shared-resources.outputs.upload_url}}
-        asset_path: ${{steps.find-msix-file.outputs.PACKAGE_PATH}}
-        asset_name: "MauiDemo_v${{needs.shared-resources.outputs.app_version}}_${{matrix.RID}}.msix"
-        asset_content_type: application/zip
-
 
   # ********************************* #
   # >>>>>>> MacCatalyst Build <<<<<<< #
@@ -454,54 +420,56 @@ jobs:
   #       if-no-files-found: warn
   #       retention-days: 10
 
-
-  create_release:
-    name: Create a new release
-    if: ${{success()}}
-    needs: [shared-resources, maui-macos, maui-windows-sideload, maui-windows-msstore] #, maui-ios, maui-android
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: MauiDemo*
-
-      - name: Confirm downloaded files
-        run: ls -R
-
-      - name: Install zip tools
-        run: |
-          sudo apt-get update
-          sudo apt-get install zip
-
-      - name: Archive each release asset
-        run: |
-          for file in *; do
-            if [ -f "$file" ]; then
-              echo "zipping up $file ..."
-              zip -r "$file.zip" "$file"
-            fi
-          done
-
-      - name: Delete original files
-        run: find . -type f -not -name '*.zip' -delete
-
-      - name: Confirm processed files
-        run: ls
-
-      - name: Create list of zip files
-        id: prepare-files-list
-        run: |
-          files=("*.zip")
-          echo "release_files=$files" >> $env:GITHUB_OUTPUT
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "${{needs.shared-resources.outputs.app_version}}"
-          tag_name: "${{needs.shared-resources.outputs.app_version}}"
-          fail_on_unmatched_files: true
-          files: ${steps.prepare-files-list.outputs.release_files}
+  # ****************************** #
+  # >>>>>>> GitHub Release <<<<<<< #
+  # ****************************** #
+  # create_release:
+  #   name: Create a new release
+  #   if: ${{success()}}
+  #   needs: [shared-resources, maui-macos, maui-windows-sideload, maui-windows-msstore] #, maui-ios, maui-android
+  #   runs-on: ubuntu-latest
+  #   defaults:
+  #     run:
+  #       shell: bash
+  #   steps:
+  #     - name: Download Artifacts
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         pattern: MauiDemo*
+
+  #     - name: Confirm downloaded files
+  #       run: ls -R
+
+  #     - name: Install zip tools
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install zip
+
+  #     - name: Archive each release asset
+  #       run: |
+  #         for file in *; do
+  #           if [ -f "$file" ]; then
+  #             echo "zipping up $file ..."
+  #             zip -r "$file.zip" "$file"
+  #           fi
+  #         done
+
+  #     - name: Delete original files
+  #       run: find . -type f -not -name '*.zip' -delete
+
+  #     - name: Confirm processed files
+  #       run: ls
+
+  #     - name: Create list of zip files
+  #       id: prepare-files-list
+  #       run: |
+  #         files=("*.zip")
+  #         echo "release_files=$files" >> $env:GITHUB_OUTPUT
+
+  #     - name: Release
+  #       uses: softprops/action-gh-release@v2
+  #       with:
+  #         name: "${{needs.shared-resources.outputs.app_version}}"
+  #         tag_name: "${{needs.shared-resources.outputs.app_version}}"
+  #         fail_on_unmatched_files: true
+  #         files: ${steps.prepare-files-list.outputs.release_files}
