also remove install from build and test

philosowaffle · Sep 24, 2023 · 304e9de · 304e9de
1 parent ae33487
commit 304e9de
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 74 deletions.
diff --git a/.github/actions/publish-ui-dist/action.yaml b/.github/actions/publish-ui-dist/action.yaml
@@ -26,16 +26,6 @@ runs:
       run: dotnet workload list
       shell: pwsh
 
-    # TODO: change back to generic "maui" instead of "maui-desktop" to install deps for all platforms, maui-desktop
-    # Pinned to workload version: https://github.com/dotnet/maui/discussions/6528
-    # - name: Install MAUI Workloads
-    #   run: dotnet workload install maui-windows maui-desktop --ignore-failed-sources --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/7.0.92.json --source https://api.nuget.org/v3/index.json
-    #   shell: pwsh
-
-    # - name: List MAUI Workloads
-    #   run: dotnet workload list
-    #   shell: pwsh
-
     - name: Prepare env
       run: |
           echo "BUILD_VERSION=$Env:GITHUB_RUN_NUMBER-$Env:GITHUB_RUN_ID" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -7,59 +7,59 @@ on:
 
 jobs:
 
-  # build-and-test:
-  #   strategy:
-  #     matrix:
-  #       dotnet: ['7.0']
-  #       os: [windows-latest]
+  build-and-test:
+    strategy:
+      matrix:
+        dotnet: ['7.0']
+        os: [windows-latest]
 
-  #   runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
 
-  #   steps:
-  #   - uses: actions/checkout@v3
+    steps:
+    - uses: actions/checkout@v3
 
-  #   - name: Install dotnet
-  #     uses: actions/setup-dotnet@v3
-  #     with:
-  #       dotnet-version: ${{ matrix.dotnet }}
+    - name: Install dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ matrix.dotnet }}
 
-  #   - name: Install MAUI Workloads
-  #     run: dotnet workload install maui --ignore-failed-sources
+    # - name: Install MAUI Workloads
+    #   run: dotnet workload install maui --ignore-failed-sources
 
-  #   - name: Clean
-  #     run: dotnet clean --configuration Debug && dotnet nuget locals all --clear
+    - name: Clean
+      run: dotnet clean --configuration Debug && dotnet nuget locals all --clear
 
-  #   - name: Restore
-  #     run: dotnet restore
+    - name: Restore
+      run: dotnet restore
 
-  #   - name: Build
-  #     run: dotnet build --no-restore --configuration Debug
+    - name: Build
+      run: dotnet build --no-restore --configuration Debug
 
-  #   - name: Test
-  #     run: dotnet test
+    - name: Test
+      run: dotnet test
 
-  # publish-windows-console-exe-dist:
-  #   name: Publish Windows Console Exe Distribution
-  #   runs-on: 'windows-latest'
-  #   needs: build-and-test
-  #   strategy:
-  #     matrix:
-  #       dotnet: [ '7.0' ]
-  #       os: [ 'win10-x64' ]
+  publish-windows-console-exe-dist:
+    name: Publish Windows Console Exe Distribution
+    runs-on: 'windows-latest'
+    needs: build-and-test
+    strategy:
+      matrix:
+        dotnet: [ '7.0' ]
+        os: [ 'win10-x64' ]
 
-  #   steps:
+    steps:
 
-  #   - uses: actions/checkout@v3
-  #   - name: Publish Windows Console Exe Distribution
-  #     uses: ./.github/actions/publish-console-exe-dist
-  #     with:
-  #       dotnet-version: ${{ matrix.dotnet }}
-  #       os: ${{ matrix.os }}
+    - uses: actions/checkout@v3
+    - name: Publish Windows Console Exe Distribution
+      uses: ./.github/actions/publish-console-exe-dist
+      with:
+        dotnet-version: ${{ matrix.dotnet }}
+        os: ${{ matrix.os }}
 
   publish-ui-dist:
     name: Publish UI Distribution
     runs-on: 'windows-latest'
-    # needs: build-and-test
+    needs: build-and-test
     strategy:
       matrix:
         dotnet: [ '7.0.401' ]
@@ -76,29 +76,29 @@ jobs:
           os: ${{ matrix.os }}
           framework: ${{ matrix.framework }}
 
-  # publish-docker-images:
-  #   name: Publish Docker Images
-  #   runs-on: ubuntu-latest
-  #   needs: build-and-test
-  #   strategy:
-  #     matrix:
-  #         dockerfile: ['Dockerfile.console', 'Dockerfile.api', 'Dockerfile.webui']
-  #         include:
-  #             - dockerfile: 'Dockerfile.console'
-  #               tag: 'pr-validator-console-A'
-  #             - dockerfile: 'Dockerfile.api'
-  #               tag: 'pr-validator-api-A'
-  #             - dockerfile: 'Dockerfile.webui'
-  #               tag: 'pr-validator-webui-A'
-
-  #   steps:
-
-  #   - uses: actions/checkout@v3
-  #   - name: Publish Docker Images
-  #     uses: ./.github/actions/publish-docker-images
-  #     with:
-  #       dockerfile: ${{ matrix.dockerfile }}
-  #       tag: ${{ matrix.tag }}
-  #       secret_docker_username: ${{ secrets.DOCKER_USERNAME }}
-  #       secret_docker_password: ${{ secrets.DOCKER_PASSWORD }}
-  #       secret_github_package: ${{ secrets.GH_PACKAGE_SECRET}}
+  publish-docker-images:
+    name: Publish Docker Images
+    runs-on: ubuntu-latest
+    needs: build-and-test
+    strategy:
+      matrix:
+          dockerfile: ['Dockerfile.console', 'Dockerfile.api', 'Dockerfile.webui']
+          include:
+              - dockerfile: 'Dockerfile.console'
+                tag: 'pr-validator-console-A'
+              - dockerfile: 'Dockerfile.api'
+                tag: 'pr-validator-api-A'
+              - dockerfile: 'Dockerfile.webui'
+                tag: 'pr-validator-webui-A'
+
+    steps:
+
+    - uses: actions/checkout@v3
+    - name: Publish Docker Images
+      uses: ./.github/actions/publish-docker-images
+      with:
+        dockerfile: ${{ matrix.dockerfile }}
+        tag: ${{ matrix.tag }}
+        secret_docker_username: ${{ secrets.DOCKER_USERNAME }}
+        secret_docker_password: ${{ secrets.DOCKER_PASSWORD }}
+        secret_github_package: ${{ secrets.GH_PACKAGE_SECRET}}