Temp change to same job for build and package

microsoft · Mar 29, 2024 · 2f86d92 · 2f86d92
1 parent 86d8890
commit 2f86d92
Showing 1 changed file with 45 additions and 34 deletions.
diff --git a/.github/workflows/fhir-oss-ci-pipeline.yml b/.github/workflows/fhir-oss-ci-pipeline.yml
@@ -72,6 +72,9 @@ jobs:
   buildAndUnitTest:
     runs-on: ubuntu-latest
     needs: setup
+    strategy:
+      matrix:
+        fhirSchemaVersion: ["Stu3", "R4", "R4B", "R5"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -94,6 +97,14 @@ jobs:
           fileVersion: ${{needs.setup.outputs.fileVersion}}
           informationalVersion: ${{needs.setup.outputs.informationalVersion}}
           majorMinorPatch: ${{needs.setup.outputs.majorMinorPatch}}
+      - name: Package Web Build Artifacts
+        uses: ./.github/actions/package-web-build-artifacts
+        with:
+          fhirschemaversion: ${{ matrix.fhirSchemaVersion }}
+          majorMinorPatch: ${{needs.setup.outputs.majorMinorPatch}}
+          outputPath: ${{env.outputPath}}
+          buildConfiguration: ${{env.buildConfiguration}}
+          semVer: ${{needs.setup.outputs.semVer}}
       # - name: Test
       #   uses: ./.github/actions/dotnet-test
       #   with:
@@ -109,40 +120,40 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: ${{env.outputPath}}
-  packageBuildArtifacts:
-    runs-on: ubuntu-latest
-    needs: [setup, buildAndUnitTest]
-    strategy:
-      matrix:
-        fhirSchemaVersion: ["Stu3", "R4", "R4B", "R5"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install Latest .Net SDK
-        uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: 'global.json'
-          dotnet-version: |
-            6.x
-            8.x
-      - name: Nuget Restore
-        working-directory: ${{github.workspace}}
-        shell: bash
-        run: dotnet restore --verbosity detailed
-      - name: Download Build Artifacts from Job Cache
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-      - name: Package Web Build Artifacts
-        uses: ./.github/actions/package-web-build-artifacts
-        with:
-          fhirschemaversion: ${{ matrix.fhirSchemaVersion }}
-          majorMinorPatch: ${{needs.setup.outputs.majorMinorPatch}}
-          outputPath: ${{env.outputPath}}
-          buildConfiguration: ${{env.buildConfiguration}}
-          semVer: ${{needs.setup.outputs.semVer}}
+  # packageBuildArtifacts:
+  #   runs-on: ubuntu-latest
+  #   needs: [setup, buildAndUnitTest]
+  #   strategy:
+  #     matrix:
+  #       fhirSchemaVersion: ["Stu3", "R4", "R4B", "R5"]
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Install Latest .Net SDK
+  #       uses: actions/setup-dotnet@v4
+  #       with:
+  #         global-json-file: 'global.json'
+  #         dotnet-version: |
+  #           6.x
+  #           8.x
+  #     - name: Nuget Restore
+  #       working-directory: ${{github.workspace}}
+  #       shell: bash
+  #       run: dotnet restore --verbosity detailed
+  #     - name: Download Build Artifacts from Job Cache
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         path: artifacts
+  #     - name: Package Web Build Artifacts
+  #       uses: ./.github/actions/package-web-build-artifacts
+  #       with:
+  #         fhirschemaversion: ${{ matrix.fhirSchemaVersion }}
+  #         majorMinorPatch: ${{needs.setup.outputs.majorMinorPatch}}
+  #         outputPath: ${{env.outputPath}}
+  #         buildConfiguration: ${{env.buildConfiguration}}
+  #         semVer: ${{needs.setup.outputs.semVer}}
       # - name: Docker Build
       #   uses: ./.github/actions/docker-build
       #   with: