Skip to content

Commit 1ad5e58

Browse files
committed
Fix versions in java actions
1 parent 890dac5 commit 1ad5e58

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/used-docker-frontend.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919

20-
21-
- name: Load Version
22-
id: set-version
23-
run: |
24-
versions=$(cat "${{ github.workspace }}/versions.json")
25-
service_version=$(echo "${versions}" | jq -r --arg s "${{inputs.image_name}}" '.[$s]')
26-
echo "version=${service_version}" >> "$GITHUB_OUTPUT"
27-
28-
2920
- name: Load Version
3021
id: set-version
3122
run: |

.github/workflows/used-docker-java-11.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ jobs:
2121
id: set-version
2222
run: |
2323
versions=$(cat "${{ github.workspace }}/versions.json")
24-
version=$(echo "${versions}" | jq -r --arg s "master-version" '.[$s]')
25-
echo "version=${version}" >> "$GITHUB_OUTPUT"
24+
service_version=$(echo "${versions}" | jq -r --arg s "${{inputs.image_name}}" '.[$s]')
25+
master_version=$(echo "${versions}" | jq -r --arg s "master-version" '.[$s]')
26+
echo "version=${service_version}" >> "$GITHUB_OUTPUT"
27+
echo "master_version=${master_version}" >> "$GITHUB_OUTPUT"
2628
2729
- name: Set up JDK 11
2830
uses: actions/setup-java@v2
@@ -34,8 +36,8 @@ jobs:
3436
working-directory: ./${{inputs.image_name}}
3537
run: |
3638
echo "Building with maven"
37-
echo "The configured version is: ${{ steps.set-version.outputs.version }}"
38-
mvn -B -Drevision=${{ steps.set-version.outputs.version }} -Pprod clean package -s settings.xml
39+
echo "The configured version is: ${{ steps.set-version.outputs.master_version }}"
40+
mvn -B -Drevision=${{ steps.set-version.outputs.master_version }} -Pprod clean package -s settings.xml
3941
env:
4042
MAVEN_TK: ${{ secrets.GITHUB_TOKEN }}
4143

.github/workflows/used-docker-java.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ jobs:
1414
steps:
1515
- name: Check out code into the right branch
1616
uses: actions/checkout@v4
17+
18+
- name: Load Version
19+
id: set-version
20+
run: |
21+
versions=$(cat "${{ github.workspace }}/versions.json")
22+
service_version=$(echo "${versions}" | jq -r --arg s "${{inputs.image_name}}" '.[$s]')
23+
echo "version=${service_version}" >> "$GITHUB_OUTPUT"
1724
1825
- name: Set up JDK 11
1926
uses: actions/setup-java@v2

0 commit comments

Comments
 (0)