Skip to content

Commit 6e5f316

Browse files
committed
CI/CD: updated our scripts.
1 parent aef0b5a commit 6e5f316

File tree

2 files changed

+13
-28
lines changed

2 files changed

+13
-28
lines changed

.github/workflows/cd.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,12 @@ jobs:
1717
include:
1818
- name: Windows
1919
os: windows-latest
20-
script: win
2120
- name: Linux
2221
os: ubuntu-latest
23-
script: linux
2422
- name: macOS (Intel)
2523
os: macos-13
26-
script: mac
2724
- name: macOS (ARM)
2825
os: macos-latest
29-
script: mac
3026
steps:
3127
- name: Check out OpenCOR
3228
uses: actions/checkout@v4
@@ -36,10 +32,10 @@ jobs:
3632
node-version: 'lts/*'
3733
- name: Install Yarn
3834
run: npm install -g yarn
39-
- name: Build OpenCOR
35+
- name: Packages OpenCOR
4036
run: |
4137
yarn
42-
yarn build:${{ matrix.script }}
38+
yarn package
4339
- name: Remove blockmap files
4440
shell: bash
4541
run: find ./dist -name '*.blockmap' -delete

.github/workflows/ci.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,17 @@ jobs:
3434
node-version: 'lts/*'
3535
- name: Install Yarn
3636
run: npm install -g yarn
37-
- name: Yarn install
37+
- name: Install all of OpenCOR's dependencies
3838
run: yarn
39-
- name: Yarn format
40-
run: |
41-
yarn format
42-
git diff --quiet
43-
- name: Yarn lint
39+
- name: Check that OpenCOR's code and OpenCOR's Web app's code are properly formatted
40+
run: yarn format:check
41+
- name: Lint OpenCOR's code and OpenCOR's Web app's code
4442
run: yarn lint
45-
- name: Yarn build
46-
run: yarn build
47-
- name: Yarn build:win (Windows only)
48-
if: ${{ runner.os == 'Windows' }}
49-
run: yarn build:win
50-
- name: Yarn build:linux (Linux only)
51-
if: ${{ runner.os == 'Linux' }}
52-
run: yarn build:linux
53-
- name: Yarn build:mac (macOS only)
54-
if: ${{ runner.os == 'macOS' }}
55-
run: yarn build:mac
56-
- name: Yarn build:unpack
57-
run: yarn build:unpack
58-
- name: Yarn build:web
59-
run: yarn build:web
60-
- name: Yarn clean
43+
- name: Type check OpenCOR's code
44+
run: yarn typecheck
45+
- name: Type check OpenCOR's Web app's code
46+
run: yarn typecheck:web
47+
- name: Package OpenCOR
48+
run: yarn package
49+
- name: Clean OpenCOR's environment
6150
run: yarn clean

0 commit comments

Comments
 (0)