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

#152 Add discovery proxy transactions scaffold and actor description.… #303

Merged
merged 1 commit into from
Sep 3, 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
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import org.sdpi.asciidoc.github.IssueImport
import java.io.File
import kotlin.system.exitProcess

fun main(args: Array<String>) = ConvertAndVerifySupplement().main(
when (System.getenv().containsKey("CI")) {
true -> args.firstOrNull()?.split(" ") ?: listOf() // caution: blanks in quotes not covered here!
false -> args.toList()
}
fun main(args: Array<String>) = ConvertAndVerifySupplement().main(args
// when (System.getenv().containsKey("CI")) {
// true -> args.firstOrNull()?.split(" ") ?: listOf() // caution: blanks in quotes not covered here!
// false -> args.toList()
// }
)

class ConvertAndVerifySupplement : CliktCommand("convert-supplement") {
Expand Down
2 changes: 1 addition & 1 deletion .github/copy_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo apt install graphviz
gem install asciidoctor
gem install asciidoctor-diagram
asciidoctor -V
cd asciidoc
cd asciidoc || exit
asciidoctor -r asciidoctor-diagram -D ../ sdpi-supplement.adoc
cd ..
mkdir sdpi-supplement
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/feature-review-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
Expand All @@ -31,11 +31,12 @@ jobs:
ruby-version: '3.0' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- name: Setup gradle
uses: gradle/actions/setup-gradle@v4

- name: Create HTML with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
build-root-directory: .ci/asciidoc-converter
run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
working-directory: .ci/asciidoc-converter

- name: Generate PlantUML diagrams and copy images
run: .github/copy_images.sh
Expand All @@ -47,7 +48,7 @@ jobs:

- name: Upload artifact
# if: success() && github.ref == 'refs/heads/master'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sdpi-supplement-${{ steps.extract_branch.outputs.branch }}
path: sdpi-supplement
15 changes: 8 additions & 7 deletions .github/workflows/latest-master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
Expand All @@ -33,12 +33,13 @@ jobs:
with:
ruby-version: '3.0' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically


- name: Setup gradle
uses: gradle/actions/setup-gradle@v4

- name: Create HTML with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
build-root-directory: .ci/asciidoc-converter
run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
working-directory: .ci/asciidoc-converter

- name: Generate PlantUML diagrams and copy images
run: .github/copy_images.sh
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ Each section shall contain a list of action items of the following format: `<bri
- Correct SES section titles ([#272](https://github.com/IHE/DEV.SDPi/issues/272))
- Implement semi-automatic version referencing by adding Asciidoc variables ( ([#284](https://github.com/IHE/DEV.SDPi/issues/284)))

### Added

- Add discovery proxy transactions scaffold and actor description ( ([152](https://github.com/IHE/DEV.SDPi/issues/152)))

## [1.3.1] - 2024-04-05

### Editorial Fixes
Expand Down
15 changes: 15 additions & 0 deletions asciidoc/docinfo.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,21 @@
margin: 1em;
}

.imageblock {
margin-bottom: 3em;
margin-top: 3em;
}

table.tableblock {
margin-bottom: 3em;
margin-top: 3em;
}

.listingblock {
margin-bottom: 3em;
margin-top: 3em;
}

#load-screen {
width: 30%;
height:100%;
Expand Down
3 changes: 0 additions & 3 deletions asciidoc/document-declarations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,3 @@ NOTE: Forward Declarations in the following table are being added "on demand" o
| Use Case

|===

{empty} +

Loading
Loading