Skip to content

Commit bedb914

Browse files
committed
ci: fix ci again
1 parent 9599d40 commit bedb914

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,22 @@ on:
66
is_release:
77
required: false
88
type: boolean
9+
default: false
10+
push:
11+
branches:
12+
- main
13+
tags:
14+
- "v*"
15+
pull_request:
16+
branches:
17+
- main
918

10-
jobs:
1119

20+
jobs:
1221
build:
1322
runs-on: ubuntu-latest
1423

1524
steps:
16-
1725
- uses: actions/checkout@v4
1826

1927
- name: Set up Python
@@ -26,14 +34,13 @@ jobs:
2634
python -m pip install --upgrade pip
2735
pip install -r tools/python/requirements.txt
2836
29-
- name: build
37+
- name: Build ontology assets
3038
run: |
3139
bash ./tools/bash/build/create-combined-turtle.sh src/imaging-ontology/
3240
python ./tools/python/build/create-schemas.py --input build/ontology_combined.ttl --output build/locales/en/schema.json
3341
34-
- name: upload assets in artifacts
42+
- name: Upload schema bundle as artifact
3543
uses: actions/upload-artifact@v4
36-
if: ${{ inputs.is_release }}
3744
with:
3845
name: schema-bundle
3946
path: build/*

.github/workflows/main-and-pr.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
8-
workflow_call:
9-
107
pull_request:
118
branches:
129
- main
@@ -17,6 +14,3 @@ jobs:
1714

1815
build:
1916
uses: ./.github/workflows/build.yml
20-
with:
21-
is_release: false
22-

.github/workflows/release.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Include ontology assets in the release
1+
name: Release workflow
22

33
on:
44
push:
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
uses: ./.github/workflows/build.yml
1212
with:
13-
is_release: true
13+
is_release: true # optional, now unused
1414

1515
checks:
1616
uses: ./.github/workflows/checks.yml
@@ -23,16 +23,13 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- name: Get schema assets
26+
- name: Download built assets
2727
uses: actions/download-artifact@v4
2828
with:
2929
name: schema-bundle
3030
path: build/
3131

32-
- name: List downloaded assets
33-
run: ls -R build/
34-
35-
- name: Create release
32+
- name: Create GitHub release
3633
uses: softprops/action-gh-release@v2
3734
with:
3835
files: build/*

0 commit comments

Comments
 (0)