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

Fixes an Workflows in Bezug auf Build von wls-broadcast-service #82

Merged
merged 5 commits into from
Apr 12, 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
13 changes: 5 additions & 8 deletions .github/workflows/dispatch-microservice-mvn-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ on:
required: true
description: service/directory to build (wls-broadcast-service, ...)

env:
gitTag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}

jobs:
run-mvn-release-prepare:
runs-on: ubuntu-latest
Expand All @@ -35,11 +32,11 @@ jobs:
cache-dependency-path: '${{ github.event.inputs.service }}/pom.xml'
- name: Perform maven release
run: >
mvn -B -ntp release:prepare -f backend/pom.xml
mvn -B -ntp release:prepare -f ${{ github.event.inputs.service }}/pom.xml
-DreleaseVersion=${{ github.event.inputs.release-version }}
-DdevelopmentVersion=${{ github.event.inputs.development-version }}
-Dtag=${{ env.gitTag }}
-Darguments="-DskipTests -B -ntp"
-Dtag=${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
-Darguments="-DskipTests"

build-github-release:
permissions:
Expand All @@ -49,7 +46,7 @@ jobs:
uses:
./.github/workflows/callable-create-github-release-from-tag.yml
with:
tag: ${{ env.gitTag }}
tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
service: ${{ github.event.inputs.service }}

build-github-container-image:
Expand All @@ -60,5 +57,5 @@ jobs:
uses:
./.github/workflows/callable-create-github-container-image.yml
with:
tag: ${{ env.gitTag }}
tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
service: ${{ github.event.inputs.service }}
8 changes: 3 additions & 5 deletions wls-broadcast-service/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.muenchen.oss.wahllokalsystem</groupId>
Expand Down Expand Up @@ -378,8 +376,8 @@
<eclipse>
<file>itm-java-codeformat/java_codestyle_formatter.xml</file>
</eclipse>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
</java>
</configuration>
<executions>
Expand Down