diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8f6a2d800..e0f317616 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -213,7 +213,7 @@ jobs: run: .\gradlew.bat :SeforimApp:packageGraalvmNsis # Microsoft Store package (x64 only for now), unsigned: the Store signs it. Kept out of the GitHub release - # (an unsigned MSIX cannot be installed from there); the msstore job submits it + # (an unsigned MSIX cannot be installed from there), submitted below - name: Build Microsoft Store package (GraalVM) if: startsWith(matrix.os, 'windows') && matrix.graalvm shell: pwsh @@ -233,6 +233,32 @@ jobs: path: msstore/*.msix if-no-files-found: error + # Submitted to Partner Center for certification (Store ID 9NC26MP2QMPS) as soon as it is built, without waiting + # for the other platforms: the package replaced, the listing kept. Tag pushes only (a manual run reuses the last + # tag's version, which the Store already has); a new submission replaces one still in certification. A Store + # failure leaves a warning and never holds back the GitHub release. Needs the PARTNER_CENTER_* secrets of an + # Entra app with the Manager role in Partner Center + - name: Setup Microsoft Store Developer CLI + if: startsWith(matrix.os, 'windows') && matrix.graalvm && github.event_name == 'push' + uses: microsoft/setup-msstore-cli@v1 + + - name: Submit to the Microsoft Store + if: startsWith(matrix.os, 'windows') && matrix.graalvm && github.event_name == 'push' + continue-on-error: true + shell: pwsh + run: | + $ErrorActionPreference = 'Stop' + msstore reconfigure --tenantId $env:TENANT_ID --sellerId $env:SELLER_ID --clientId $env:CLIENT_ID --clientSecret $env:CLIENT_SECRET + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + $msix = Get-ChildItem msstore\*.msix | Select-Object -First 1 + msstore publish $msix.FullName --appId 9NC26MP2QMPS + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + env: + TENANT_ID: ${{ secrets.PARTNER_CENTER_TENANT_ID }} + SELLER_ID: ${{ secrets.PARTNER_CENTER_SELLER_ID }} + CLIENT_ID: ${{ secrets.PARTNER_CENTER_CLIENT_ID }} + CLIENT_SECRET: ${{ secrets.PARTNER_CENTER_CLIENT_SECRET }} + # Windows JVM build (ARM64) - name: Build Windows NSIS installer (JVM) if: startsWith(matrix.os, 'windows') && !matrix.graalvm @@ -354,39 +380,3 @@ jobs: artifacts-path: artifacts tag: ${{ env.TAG }} release-type: release - - # Submits the x64 MSIX to Partner Center for certification, beside the GitHub release (a Store failure never - # holds it back). Tag pushes only: a manual run reuses the last tag's version, which the Store already has. - # A new submission replaces one still in certification. Needs the PARTNER_CENTER_* secrets of an Entra app - # with the Manager role in Partner Center. - msstore: - needs: build - if: github.event_name == 'push' - runs-on: windows-latest - steps: - - name: Download Microsoft Store package - uses: actions/download-artifact@v7 - with: - name: msstore-x64 - path: msstore - - - name: Setup Microsoft Store Developer CLI - uses: microsoft/setup-msstore-cli@v1 - - - name: Configure Microsoft Store Developer CLI - shell: pwsh - run: >- - msstore reconfigure - --tenantId ${{ secrets.PARTNER_CENTER_TENANT_ID }} - --sellerId ${{ secrets.PARTNER_CENTER_SELLER_ID }} - --clientId ${{ secrets.PARTNER_CENTER_CLIENT_ID }} - --clientSecret ${{ secrets.PARTNER_CENTER_CLIENT_SECRET }} - - # Store ID 9NC26MP2QMPS. Replaces the package, keeps the listing, and commits for certification - - name: Submit to the Microsoft Store - shell: pwsh - run: | - $ErrorActionPreference = 'Stop' - $msix = Get-ChildItem msstore\*.msix | Select-Object -First 1 - msstore publish $msix.FullName --appId 9NC26MP2QMPS - if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }