From 8a0526b168057fed6869480371949144e17a7275 Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Mon, 16 Sep 2024 10:13:01 +0200 Subject: [PATCH 1/4] fix: client build --- client/apps/portal-administration/package.json | 2 +- clientBackend.Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/apps/portal-administration/package.json b/client/apps/portal-administration/package.json index 22a54e110..ed850f8c9 100644 --- a/client/apps/portal-administration/package.json +++ b/client/apps/portal-administration/package.json @@ -6,7 +6,7 @@ "type": "module", "main": "src/index.ts", "scripts": { - "build": "npx fusion-framework-cli app build", + "build": "fusion-framework-cli app build", "dev": "fusion-framework-cli app dev", "docker": "cd .. && sh docker-script.sh app-react", "bundle": "fusion-framework-cli app pack" diff --git a/clientBackend.Dockerfile b/clientBackend.Dockerfile index b9cd6a6c3..79ada3d98 100644 --- a/clientBackend.Dockerfile +++ b/clientBackend.Dockerfile @@ -13,7 +13,6 @@ RUN yarn install --frozen-lockfile # run yarn install for the portal-administration app RUN cd apps/portal-administration -RUN npm i -g @equinor/fusion-framework-cli RUN yarn install RUN cd ../.. From 9c39ddfe4cac6447cf1fabf77effbfb0a7e1254b Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Mon, 16 Sep 2024 10:18:28 +0200 Subject: [PATCH 2/4] fix: install global --- clientBackend.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/clientBackend.Dockerfile b/clientBackend.Dockerfile index 79ada3d98..b9cd6a6c3 100644 --- a/clientBackend.Dockerfile +++ b/clientBackend.Dockerfile @@ -13,6 +13,7 @@ RUN yarn install --frozen-lockfile # run yarn install for the portal-administration app RUN cd apps/portal-administration +RUN npm i -g @equinor/fusion-framework-cli RUN yarn install RUN cd ../.. From 39eed8a57c6ba7c2bd8ba50301f0c2cb83d85a25 Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Mon, 16 Sep 2024 10:26:48 +0200 Subject: [PATCH 3/4] chore: Update build command for client apps --- .github/workflows/common-release.yml | 2 +- .github/workflows/deploy-apps-test.yml | 2 +- client/apps/portal-administration/package.json | 2 +- client/package.json | 1 + clientBackend.Dockerfile | 6 ------ 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/common-release.yml b/.github/workflows/common-release.yml index d5cf80401..4a5ef7203 100644 --- a/.github/workflows/common-release.yml +++ b/.github/workflows/common-release.yml @@ -140,7 +140,7 @@ jobs: - name: Build run: | cd client - yarn build + yarn build:apps - name: Deploy run: | diff --git a/.github/workflows/deploy-apps-test.yml b/.github/workflows/deploy-apps-test.yml index 609a5697d..fcafaee4b 100644 --- a/.github/workflows/deploy-apps-test.yml +++ b/.github/workflows/deploy-apps-test.yml @@ -45,7 +45,7 @@ jobs: - name: Build run: | cd client - yarn build + yarn build:apps - name: Deploy run: | diff --git a/client/apps/portal-administration/package.json b/client/apps/portal-administration/package.json index ed850f8c9..c29d9a5c0 100644 --- a/client/apps/portal-administration/package.json +++ b/client/apps/portal-administration/package.json @@ -6,7 +6,7 @@ "type": "module", "main": "src/index.ts", "scripts": { - "build": "fusion-framework-cli app build", + "build:apps": "fusion-framework-cli app build", "dev": "fusion-framework-cli app dev", "docker": "cd .. && sh docker-script.sh app-react", "bundle": "fusion-framework-cli app pack" diff --git a/client/package.json b/client/package.json index d01fe15ec..e883b6e88 100644 --- a/client/package.json +++ b/client/package.json @@ -6,6 +6,7 @@ "dev": "npx lerna run dev", "start": "npx lerna run serve", "build": "npx lerna run build", + "build:apps": "npx lerna run build:apps", "test:all": "test:coverage && build:coverage", "test": "lerna run test", "test:coverage": "lerna run test:coverage", diff --git a/clientBackend.Dockerfile b/clientBackend.Dockerfile index b9cd6a6c3..b0b47343d 100644 --- a/clientBackend.Dockerfile +++ b/clientBackend.Dockerfile @@ -11,12 +11,6 @@ COPY ["/client", "."] RUN yarn install --frozen-lockfile -# run yarn install for the portal-administration app -RUN cd apps/portal-administration -RUN npm i -g @equinor/fusion-framework-cli -RUN yarn install -RUN cd ../.. - RUN npx yarn run build # 2: Build & run web server From 64508ed4d4cf8d66a0d1963163a572bbeb5cd655 Mon Sep 17 00:00:00 2001 From: Noggling Date: Mon, 16 Sep 2024 08:33:23 +0000 Subject: [PATCH 4/4] chore: create pr-747-2073460455.md --- .changeset/pr-747-2073460455.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/pr-747-2073460455.md diff --git a/.changeset/pr-747-2073460455.md b/.changeset/pr-747-2073460455.md new file mode 100644 index 000000000..8ab3f53b8 --- /dev/null +++ b/.changeset/pr-747-2073460455.md @@ -0,0 +1,5 @@ + +--- +"fusion-project-portal": patch +--- +apps are now on separate build pipeline