From f3c643df99643d8c64bf09b86f36e79db4843bf8 Mon Sep 17 00:00:00 2001 From: stianStensli Date: Tue, 23 Aug 2022 15:41:39 +0200 Subject: [PATCH 1/5] ny workflow --- .github/404_temp.html | 12 ++++++++++++ .../workflows/build-deploy-feature-branch-q1.yaml | 7 ++----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 .github/404_temp.html diff --git a/.github/404_temp.html b/.github/404_temp.html new file mode 100644 index 000000000..85a9a8d25 --- /dev/null +++ b/.github/404_temp.html @@ -0,0 +1,12 @@ + + + + 404 oversikten + + +Denne url'en er ikke lengre i bruk.
+Hvis du har denne url'en lagret som et bokmerke så må den endres.

+Ny url er:
+https://veilarbportefoljeflate.intern.nav.no/
+ + \ No newline at end of file diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml index 35d2555ee..65894f94e 100644 --- a/.github/workflows/build-deploy-feature-branch-q1.yaml +++ b/.github/workflows/build-deploy-feature-branch-q1.yaml @@ -16,11 +16,8 @@ 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 404 fil + run: cp ./.github/pages/404.html ./build/404_temp.html - name: Login to Docker uses: docker/login-action@v1 with: From 73199a9c037201fa7a75afa307c74a0cc086d70c Mon Sep 17 00:00:00 2001 From: stianStensli Date: Tue, 23 Aug 2022 15:49:47 +0200 Subject: [PATCH 2/5] mkdir --- .github/workflows/build-deploy-feature-branch-q1.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml index 65894f94e..a07895299 100644 --- a/.github/workflows/build-deploy-feature-branch-q1.yaml +++ b/.github/workflows/build-deploy-feature-branch-q1.yaml @@ -16,8 +16,10 @@ jobs: with: node-version: '16' cache: 'npm' + - name: Legg til build + run: run mkdir ./build - name: Legg til 404 fil - run: cp ./.github/pages/404.html ./build/404_temp.html + run: cp ./.github/pages/404.html ./build/index.html - name: Login to Docker uses: docker/login-action@v1 with: From d9f10ee666db397f14175d747901ea5eda79784d Mon Sep 17 00:00:00 2001 From: stianStensli Date: Tue, 23 Aug 2022 15:51:16 +0200 Subject: [PATCH 3/5] mkdir v2 --- .github/workflows/build-deploy-feature-branch-q1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml index a07895299..117cbc605 100644 --- a/.github/workflows/build-deploy-feature-branch-q1.yaml +++ b/.github/workflows/build-deploy-feature-branch-q1.yaml @@ -17,7 +17,7 @@ jobs: node-version: '16' cache: 'npm' - name: Legg til build - run: run mkdir ./build + run: mkdir ./build - name: Legg til 404 fil run: cp ./.github/pages/404.html ./build/index.html - name: Login to Docker From 854984e6e0e480b33bb010e65bbd7264fa55decb Mon Sep 17 00:00:00 2001 From: stianStensli Date: Tue, 23 Aug 2022 17:43:06 +0200 Subject: [PATCH 4/5] 404 i master --- .github/404_temp.html | 4 ++-- .../workflows/build-deploy-feature-branch-q1.yaml | 2 +- .github/workflows/build-deploy.yaml | 14 ++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/404_temp.html b/.github/404_temp.html index 85a9a8d25..80f4ae74c 100644 --- a/.github/404_temp.html +++ b/.github/404_temp.html @@ -4,8 +4,8 @@ 404 oversikten -Denne url'en er ikke lengre i bruk.
-Hvis du har denne url'en lagret som et bokmerke så må den endres.

+Denne url'en er ikke lenger i bruk.
+Hvis du har denne url'en lagret som et bokmerke saa maa den endres.

Ny url er:
https://veilarbportefoljeflate.intern.nav.no/
diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml index 117cbc605..07a33fe84 100644 --- a/.github/workflows/build-deploy-feature-branch-q1.yaml +++ b/.github/workflows/build-deploy-feature-branch-q1.yaml @@ -19,7 +19,7 @@ jobs: - name: Legg til build run: mkdir ./build - name: Legg til 404 fil - run: cp ./.github/pages/404.html ./build/index.html + 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 index 0dd8fec8a..2ad504d1a 100644 --- 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: From 08638da82b34362777281f09aa1cfd1e1d84a189 Mon Sep 17 00:00:00 2001 From: stianStensli Date: Wed, 24 Aug 2022 10:57:08 +0200 Subject: [PATCH 5/5] utf-8 --- .github/404_temp.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/404_temp.html b/.github/404_temp.html index 80f4ae74c..f10a3dfd1 100644 --- a/.github/404_temp.html +++ b/.github/404_temp.html @@ -1,12 +1,12 @@ - + 404 oversikten Denne url'en er ikke lenger i bruk.
-Hvis du har denne url'en lagret som et bokmerke saa maa den endres.

+Hvis du har denne url'en lagret som et bokmerke så må den endres.

Ny url er:
-https://veilarbportefoljeflate.intern.nav.no/
+https://veilarbportefoljeflate.intern.nav.no \ No newline at end of file