Merge pull request #338 from navikt/oppdater_CV-titler

FS-255228: Oppdater CV-titler + pakkebumping
navikt · Mar 20, 2023 · 4dd015d · 4dd015d
2 parents a8efb4f + e041b9b
commit 4dd015d
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 197 deletions.
diff --git a/.github/workflows/depoloy-prod-gcp.yaml → .github/workflows/deploy-prod-gcp.yaml b/.github/workflows/depoloy-prod-gcp.yaml → .github/workflows/deploy-prod-gcp.yaml
@@ -36,9 +36,11 @@ jobs:
               uses: google-github-actions/setup-gcloud@v0
             - name: Upload files to GCS
               run: gsutil -m rsync -r build gs://veilarbmaofs-prod
+            - name: Create release tag
+              run: echo "RELEASE_TAG=$(TZ=\"Europe/Oslo\" date +%Y.%m.%d_%H.%M)-$(git rev-parse --short=12 HEAD)" >> $GITHUB_ENV
             - name: Create release
               uses: softprops/action-gh-release@v1
               with:
                   name: Release to prod
                   target_commitish: master
-                  tag_name: release/prod@${{ github.sha }}
+                  tag_name: release/prod@${RELEASE_TAG}
diff --git a/.github/workflows/update-github-pages.yaml b/.github/workflows/update-github-pages.yaml
@@ -1,6 +1,9 @@
 name: Deploy github pages
 on:
     workflow_dispatch:
+    push:
+      branches:
+        - master
 jobs:
     update-gh-pages:
         name: Update GitHub pages
@@ -18,7 +21,7 @@ jobs:
             - name: Build mock application
               run: npm run build:mock
             - name: Update GitHub pages
-              uses: softprops/action-gh-release@v1
+              uses: peaceiris/actions-gh-pages@v3
               with:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
                   publish_dir: ./build