Merge pull request #728 from navikt/nyIngressAdvarsel

ny workflow
navikt · Aug 24, 2022 · 0b532b5 · 0b532b5
2 parents ab977e9 + 956169d
commit 0b532b5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/.github/404_temp.html b/.github/404_temp.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>404 oversikten</title>
+</head>
+<body>
+Denne url'en er ikke lenger i bruk. </br>
+Hvis du har denne url'en lagret som et bokmerke så må den endres.</br></br>
+Ny url er:</br>
+https://veilarbportefoljeflate.intern.nav.no
+</body>
+</html>
diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml
@@ -16,11 +16,10 @@ jobs:
               with:
                   node-version: '16'
                   cache: 'npm'
-            - run: npm ci
-            - name: Build production artifact
-              run: npm run build
-            - name: Run tests
-              run: npm run test
+            - name: Legg til build
+              run: mkdir ./build
+            - name: Legg til 404 fil
+              run: cp ./.github/404_temp.html ./build/index.html
             - name: Login to Docker
               uses: docker/login-action@v1
               with:

diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
@@ -38,9 +38,8 @@ jobs:
               with:
                   node-version: '16'
                   cache: 'npm'
-            - run: npm ci
-            - run: npm run build
-            - run: npm run test
+            - run: mkdir ./build
+            - run: cp ./.github/404_temp.html ./build/index.html
     build-project-and-docker-image:
         runs-on: ubuntu-latest
         name: Build project and publish Docker image
@@ -51,11 +50,10 @@ jobs:
               with:
                   node-version: '16'
                   cache: 'npm'
-            - run: npm ci
-            - name: Build production artifact
-              run: npm run build
-            - name: Run tests
-              run: npm run test
+            - name: Legg til build
+              run: mkdir ./build
+            - name: Legg til 404 fil
+              run: cp ./.github/404_temp.html ./build/index.html
             - name: Login to Docker
               uses: docker/login-action@v1
               with: