Skip to content

Commit 4ebcac2

Browse files
committed
Merge branch '499-refactor-sdpi-specification-to-be-a-standalone-standard' of https://github.com/IHE/DEV.SDPi into 499-refactor-sdpi-specification-to-be-a-standalone-standard
2 parents 599927f + e788ccb commit 4ebcac2

2 files changed

Lines changed: 41 additions & 19 deletions

File tree

.github/prepare_artifacts.sh

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,28 @@ gem install asciidoctor-diagram
55
gem install asciidoctor-diagram-plantuml
66
asciidoctor -V
77
cd asciidoc || exit
8-
asciidoctor -r asciidoctor-diagram -D ../ sdpi-standard.adoc
8+
9+
mkdir sdpi-documents
10+
11+
asciidoctor -r asciidoctor-diagram -D ../sdpi-documents sdpi-standard.adoc
12+
asciidoctor -r asciidoctor-diagram -D ../sdpi-documents sdpi-supplement.adoc
913
cd ..
10-
mkdir sdpi-standard
11-
cp -R asciidoc/images sdpi-standard/images
12-
cp -R asciidoc/js sdpi-standard/js
13-
cp -R asciidoc/css sdpi-standard/css
14-
cp -R asciidoc/fonts sdpi-standard/fonts
15-
rm -rf sdpi-standard/.asciidoctor
16-
rm -rf sdpi-standard/readme.md
14+
15+
mkdir sdpi-documents/sdpi-standard
16+
cp -R asciidoc/images sdpi-documents/sdpi-standard/images
17+
cp -R asciidoc/js sdpi-documents/sdpi-standard/js
18+
cp -R asciidoc/css sdpi-documents/sdpi-standard/css
19+
cp -R asciidoc/fonts sdpi-documents/sdpi-standard/fonts
20+
rm -rf sdpi-documents/sdpi-standard/.asciidoctor
21+
rm -rf sdpi-documents/sdpi-standard/readme.md
22+
23+
mkdir sdpi-documents/sdpi-supplement
24+
cp -R asciidoc/images sdpi-documents/sdpi-supplement/images
25+
cp -R asciidoc/js sdpi-documents/sdpi-supplement/js
26+
cp -R asciidoc/css sdpi-documents/sdpi-supplement/css
27+
cp -R asciidoc/fonts sdpi-documents/sdpi-supplement/fonts
28+
rm -rf sdpi-documents/sdpi-supplement/.asciidoctor
29+
rm -rf sdpi-documents/sdpi-supplement/readme.md
1730

1831
sudo apt-get install zip gzip tar
19-
zip -r "sdpi-standard-$1.zip" sdpi-standard
32+
zip -r "sdpi-documents-$1.zip" sdpi-documents

.github/workflows/feature-review-build.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
env:
66
CI: true
7-
7+
88
jobs:
99
build:
1010

@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout branch
1818
uses: actions/checkout@v4
19-
19+
2020
- name: Set up JDK 17
2121
uses: actions/setup-java@v4
2222
with:
@@ -30,25 +30,34 @@ jobs:
3030
with:
3131
ruby-version: '3.0' # Not needed with a .ruby-version file
3232
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
33-
33+
3434
- name: Setup gradle
3535
uses: gradle/actions/setup-gradle@v4
3636

37-
- name: Create HTML with Gradle
38-
run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-standard --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
37+
- name: Create folders
38+
run: |
39+
mkdir -p sdpi-documents/sdpi-standard
40+
mkdir -p sdpi-documents/sdpi-supplement
41+
42+
- name: Create SDPi Standard HTML with Gradle
43+
run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-documents/sdpi-standard --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
3944
working-directory: .ci/asciidoc-converter
4045

41-
- name: Generate PlantUML diagrams and static files
46+
- name: Create SDPi Supplement HTML with Gradle
47+
run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-documents/sdpi-supplement --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
48+
working-directory: .ci/asciidoc-converter
49+
50+
- name: Generate SDPi Standard and Supplement PlantUML diagrams and static files
4251
run: .github/prepare_artifacts.sh "x.x.x"
43-
52+
4453
- name: Extract branch name
4554
shell: bash
4655
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" | tr '/' '-' >> $GITHUB_OUTPUT
4756
id: extract_branch
48-
57+
4958
- name: Upload artifact
5059
# if: success() && github.ref == 'refs/heads/master'
5160
uses: actions/upload-artifact@v4
5261
with:
53-
name: sdpi-standard-${{ steps.extract_branch.outputs.branch }}
54-
path: sdpi-standard
62+
name: sdpi-documents-${{ steps.extract_branch.outputs.branch }}
63+
path: sdpi-documents

0 commit comments

Comments
 (0)