Skip to content

Commit

Permalink
fix: build-fix (#747)
Browse files Browse the repository at this point in the history
Co-authored-by: Noggling <[email protected]>
  • Loading branch information
Noggling and Noggling authored Sep 16, 2024
1 parent 9da4959 commit 8feb4f5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changeset/pr-747-2073460455.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

---
"fusion-project-portal": patch
---
apps are now on separate build pipeline
2 changes: 1 addition & 1 deletion .github/workflows/common-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
- name: Build
run: |
cd client
yarn build
yarn build:apps
- name: Deploy
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-apps-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Build
run: |
cd client
yarn build
yarn build:apps
- name: Deploy
run: |
Expand Down
2 changes: 1 addition & 1 deletion client/apps/portal-administration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "module",
"main": "src/index.ts",
"scripts": {
"build": "npx 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"
Expand Down
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 0 additions & 6 deletions clientBackend.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8feb4f5

Please sign in to comment.