Skip to content

Commit 21510e6

Browse files
committed
update workflows based on restructuring
1 parent 39a0df2 commit 21510e6

2 files changed

Lines changed: 24 additions & 22 deletions

File tree

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ jobs:
2323
with:
2424
node-version: "18"
2525
cache: npm
26-
cache-dependency-path: schema-conversion-orchestrator/external_converters/node/package-lock.json
26+
cache-dependency-path: external_converters/node/package-lock.json
2727

2828
- name: Install dependencies
29-
working-directory: schema-conversion-orchestrator/external_converters/node
29+
working-directory: external_converters/node
3030
run: npm ci
3131

3232
- name: Build TypeScript
33-
working-directory: schema-conversion-orchestrator/external_converters/node
33+
working-directory: external_converters/node
3434
run: npm run build
3535

3636
- name: Smoke-test — list converters
37-
working-directory: schema-conversion-orchestrator/external_converters/node
37+
working-directory: external_converters/node
3838
run: node dist/index.js list
3939

4040
- name: Upload dist artifact
@@ -43,9 +43,9 @@ jobs:
4343
name: node-converter
4444
retention-days: 1
4545
path: |
46-
schema-conversion-orchestrator/external_converters/node/dist/
47-
schema-conversion-orchestrator/external_converters/node/package.json
48-
schema-conversion-orchestrator/external_converters/node/package-lock.json
46+
external_converters/node/dist/
47+
external_converters/node/package.json
48+
external_converters/node/package-lock.json
4949
5050
build-java:
5151
name: Build Java converter
@@ -68,16 +68,16 @@ jobs:
6868
restore-keys: ${{ runner.os }}-maven-
6969

7070
- name: Build with Maven
71-
working-directory: schema-conversion-orchestrator/external_converters/java
71+
working-directory: external_converters/java
7272
run: mvn clean package -B -DskipTests
7373

7474
- name: Smoke-test — list converters
75-
working-directory: schema-conversion-orchestrator/external_converters/java
75+
working-directory: external_converters/java
7676
run: java -jar converter.jar list
7777

7878
- name: Upload JAR artifact
7979
uses: actions/upload-artifact@v6
8080
with:
8181
name: java-converter
8282
retention-days: 1
83-
path: schema-conversion-orchestrator/external_converters/java/converter.jar
83+
path: external_converters/java/converter.jar

.github/workflows/ci.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
# ---------------------------------------------------------------------------
1111
# Unit tests — pure Python, no external processes, no Docker.
12-
# Only installs requirements-dev.txt (Flask + strenum + pytest) — the heavy
12+
# Only installs requirements/dev.txt (Flask + strenum + pytest) — the heavy
1313
# converter packages (linkml, mdmodels, …) are not needed because the tests
1414
# inject mock converters and register_converters is a lazy import.
1515
# ---------------------------------------------------------------------------
@@ -25,13 +25,13 @@ jobs:
2525
with:
2626
python-version: "3.11"
2727
cache: pip
28-
cache-dependency-path: schema-conversion-orchestrator/requirements-dev.txt
28+
cache-dependency-path: requirements/dev.txt
2929

3030
- name: Install test dependencies
31-
run: pip install -r schema-conversion-orchestrator/requirements-dev.txt
31+
run: pip install -r requirements/dev.txt
3232

3333
- name: Run unit tests
34-
run: pytest schema-conversion-orchestrator/tests/ -v --tb=short
34+
run: python -m pytest tests/ -v --tb=short
3535

3636
# ---------------------------------------------------------------------------
3737
# Build sub-packages (Java JAR + TypeScript dist)
@@ -61,19 +61,19 @@ jobs:
6161
with:
6262
node-version: "18"
6363
cache: npm
64-
cache-dependency-path: schema-conversion-orchestrator/external_converters/node/package-lock.json
64+
cache-dependency-path: external_converters/node/package-lock.json
6565

6666
- name: Build sub-packages
67-
run: bash build_subpackages.sh
67+
run: bash scripts/build_subpackages.sh
6868

6969
- name: Upload build artifacts
7070
uses: actions/upload-artifact@v6
7171
with:
7272
name: converter-artifacts
7373
retention-days: 1
7474
path: |
75-
schema-conversion-orchestrator/external_converters/java/converter.jar
76-
schema-conversion-orchestrator/external_converters/node/dist/
75+
external_converters/java/converter.jar
76+
external_converters/node/dist/
7777
7878
# ---------------------------------------------------------------------------
7979
# Docker integration test — build image, start service, hit real endpoints
@@ -90,15 +90,16 @@ jobs:
9090
uses: actions/download-artifact@v7
9191
with:
9292
name: converter-artifacts
93+
path: external_converters
9394

9495
- name: Set up Docker Buildx
9596
uses: docker/setup-buildx-action@v4
9697

9798
- name: Build Docker image
9899
uses: docker/build-push-action@v7
99100
with:
100-
context: schema-conversion-orchestrator
101-
file: schema-conversion-orchestrator/Dockerfile
101+
context: .
102+
file: deploy/docker/Dockerfile
102103
push: false
103104
load: true
104105
tags: schema-converter:ci
@@ -182,6 +183,7 @@ jobs:
182183
uses: actions/download-artifact@v7
183184
with:
184185
name: converter-artifacts
186+
path: external_converters
185187

186188
- name: Set lowercase image name
187189
run: |
@@ -200,8 +202,8 @@ jobs:
200202
- name: Build and push
201203
uses: docker/build-push-action@v7
202204
with:
203-
context: schema-conversion-orchestrator
204-
file: schema-conversion-orchestrator/Dockerfile
205+
context: .
206+
file: deploy/docker/Dockerfile
205207
push: true
206208
tags: |
207209
${{ env.IMAGE }}:latest

0 commit comments

Comments
 (0)