endring i cdn upload

navikt · Apr 23, 2024 · f9ed81c · f9ed81c
1 parent 6e2ef04
commit f9ed81c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -61,12 +61,15 @@ jobs:
       - name: Bygg klient(yarn run build)
         run: yarn run build
 
-      - name: upload to CDN
-        uses: navikt/frontend/actions/cdn-upload/v1@main
+      - name: Upload static files to NAV CDN
+        uses: nais/deploy/actions/cdn-upload/v2@master
+        if: ${{ inputs.cdn == true }}
         with:
-          cdn-team-name: aap
+          team: aap
           source: ./.next/static
-          destination: /aap-kalkulator-frontend/_next
+          destination: /${{ inputs.appname }}/_next
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
       - name: Set up Docker Buildx
         id: buildx

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -63,12 +63,15 @@ jobs:
             - name: Bygg klient(yarn run build)
               run: yarn run build
 
-            - name: upload to CDN
-              uses: navikt/frontend/actions/cdn-upload/v1@main
+            - name: Upload static files to NAV CDN
+              uses: nais/deploy/actions/cdn-upload/v2@master
+              if: ${{ inputs.cdn == true }}
               with:
-                cdn-team-name: aap
+                team: aap
                 source: ./.next/static
-                destination: /aap-kalkulator-frontend/_next
+                destination: /${{ inputs.appname }}/_next
+                identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+                project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
             - name: Set up Docker Buildx
               id: buildx