From 65f03b14f11d7161ab6a8ee57d5054349eb69564 Mon Sep 17 00:00:00 2001 From: Heiko Scherrer Date: Tue, 5 Nov 2024 10:53:12 +0100 Subject: [PATCH] #1 Split into wrapper and library implementation --- .github/workflows/branch-build.yml | 7 +++++-- .github/workflows/master-build.yml | 2 +- .github/workflows/master-docs.yml | 13 ++++++++++--- scripts/docker_build | 1 - scripts/docker_build_release | 1 - 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml index 7cad603..cdee1b8 100644 --- a/.github/workflows/branch-build.yml +++ b/.github/workflows/branch-build.yml @@ -1,7 +1,10 @@ - - ./mvnw clean verify + ./mvnw verify -DsurefireArgs=-Dspring.profiles.active=ASYNCHRONOUS,TEST -Dspring.rabbitmq.host=localhost -Dci.buildNumber=$GITHUB_RUN_NUMBER diff --git a/.github/workflows/master-docs.yml b/.github/workflows/master-docs.yml index 5409530..f49889b 100644 --- a/.github/workflows/master-docs.yml +++ b/.github/workflows/master-docs.yml @@ -10,7 +10,7 @@ env: MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn jobs: - site_job: + build_site: if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest name: Build Microservice Docs @@ -43,6 +43,12 @@ jobs: uses: actions/setup-java@v1 with: java-version: 21 + - name: Cache SonarQube packages + uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages uses: actions/cache@v1 with: @@ -51,7 +57,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Install tools run: | - sudo apt-get install graphviz + sudo apt-get update + sudo apt-get install graphviz gsfonts graphviz-doc git config --global user.email "ci@example.com" git config --global user.name "CI Server" - name: Site @@ -69,6 +76,6 @@ jobs: -Dscmpublish.pubScmUrl=scm:git:https://openwms:$PUSHKEY@github.com/openwms/org.openwms.tms.routing.git -DdeveloperConnectionUrl=scm:git:https://openwms:$PUSHKEY@github.com/openwms/org.openwms.tms.routing.git -Dci.buildNumber=$GITHUB_RUN_NUMBER - -Pschemagen -B $MAVEN_OPTS + -Prelease,coverage -B $MAVEN_OPTS env: PUSHKEY: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/docker_build b/scripts/docker_build index a503c55..fe6cfb5 100755 --- a/scripts/docker_build +++ b/scripts/docker_build @@ -1,3 +1,2 @@ #!/bin/bash -echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin docker build -t openwms/org.openwms.tms.routing:latest . \ No newline at end of file diff --git a/scripts/docker_build_release b/scripts/docker_build_release index e157b7f..1f506ae 100755 --- a/scripts/docker_build_release +++ b/scripts/docker_build_release @@ -1,3 +1,2 @@ #!/bin/bash -echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin docker build -t openwms/org.openwms.tms.routing:$VERSION-$GITHUB_RUN_NUMBER .