Merge pull request #3075 from PrismLibrary/dev/ds/ci-updates

dansiegel · web-flow · commit 51f0029ad29f · 2024-02-14T15:51:29.000-06:00
Update skip options for uno-check
diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
@@ -28,5 +28,5 @@ jobs:
       windows-sdk-version: 18362
       dotnet-version: 8.0.x
       uno-check: true
-      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
+      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       uno-check: true
-      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
+      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true
       artifact-name: Uno
diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
@@ -39,6 +39,7 @@ jobs:
       solution-path: PrismLibrary_Forms.slnf
       code-sign: true
       artifact-name: Forms
+      jdk-version: 13
     secrets:
       codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
       codeSignClientId: ${{ secrets.CodeSignClientId }}
@@ -51,10 +52,9 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.400
       windows-sdk-version: 18362
       uno-check: true
-      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
+      uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true
       artifact-name: Uno
