Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: build-fix #747

Merged
merged 4 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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