Flytter ut for quick build også

navikt · Aug 29, 2024 · a865230 · a865230
1 parent 17ddcad
commit a865230
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 47 deletions.
diff --git a/.github/workflows/ciBuild.yml b/.github/workflows/ciBuild.yml
@@ -31,35 +31,3 @@ jobs:
           setDefaultDevhubUsername: true
 
       - uses: navikt/sf-platform/.github/actions/ciBuildAndPublishArtifact@main
-
-      # - name: "Build package"
-      #   run: |
-      #     sfp build --devhubalias devhub --diffcheck --buildnumber ${GITHUB_RUN_ID} --branch ${GITHUB_REF#refs/heads/}
-
-      # - name: "Publish artifacts"
-      #   if: ${{ success() }}
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: build-artifacts
-      #     path: artifacts
-
-      # - name: "Authenticate to npm"
-      #   uses: actions/setup-node@v4
-      #   with:
-      #     registry-url: "https://npm.pkg.github.com"
-
-      # - name: "Publish"
-      #   run: |
-      #     sfp publish --artifactdir artifacts --npm --scope @${{ github.repository_owner }}  --gittag --pushgittag
-      #   env:
-      #     NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      #   # Upload Flxbl logs
-      # - name: "Publish logs"
-      #   if: ${{ always() }}
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: "logs"
-      #     path: .sfpowerscripts
-      #     if-no-files-found: ignore
-      #     retention-days: 1
diff --git a/.github/workflows/ciQuickBuild.yml b/.github/workflows/ciQuickBuild.yml
@@ -37,19 +37,9 @@ jobs:
         run: |
           sfp quickbuild --devhubalias devhub --diffcheck --buildnumber ${GITHUB_RUN_ID} --branch ${GITHUB_REF#refs/heads/}
 
-      - name: "Publish artifacts"
-        if: ${{ success() }}
-        uses: actions/upload-artifact@v4
+      - uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@main
         with:
-          name: quickbuild-artifacts
-          path: artifacts
-
-        # Upload Flxbl logs
-      - name: "Publish logs"
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: "logs"
-          path: .sfpowerscripts
-          if-no-files-found: ignore
-          retention-days: 1
+          artifactName: "build-artifacts"
+          uploadArtifacts: true
+          logName: "logs"
+          publishLogs: true