Skip to content

Commit b7714d3

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .github/workflows/maven.yml
2 parents 78e7c34 + cd72c52 commit b7714d3

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/docker.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
username: ${{ secrets.DOCKERHUB_SAMPLES_USERNAME }}
2020
password: ${{ secrets.DOCKERHUB_SAMPLES_PASSWORD }}
2121
- name: Install GitVersion
22-
uses: gittools/actions/gitversion/[email protected].7
22+
uses: gittools/actions/gitversion/[email protected].14
2323
with:
2424
versionSpec: 5.x
2525
- id: determine_version
2626
name: Determine Version
27-
uses: gittools/actions/gitversion/[email protected].7
27+
uses: gittools/actions/gitversion/[email protected].14
2828
with:
2929
additionalArguments: /overrideconfig mode=Mainline
3030
- name: Install Octopus Deploy CLI
@@ -36,9 +36,6 @@ jobs:
3636
with:
3737
java-version: '17'
3838
distribution: adopt
39-
- name: Set Version
40-
run: ./mvnw --batch-mode versions:set -DnewVersion=${{ steps.determine_version.outputs.semVer }}
41-
shell: bash
4239
- name: Test
4340
run: ./mvnw --batch-mode test
4441
shell: bash
@@ -54,12 +51,12 @@ jobs:
5451
uses: docker/build-push-action@v3
5552
with:
5653
push: true
57-
tags: octopussamples/randomquotesjava:latest
54+
tags: octopussamples/randomquotesjava:${{ steps.determine_version.outputs.semVer }}
5855
- name: Create Octopus Release
5956
uses: OctopusDeploy/[email protected]
6057
with:
6158
api_key: ${{ secrets.OCTOPUS_API_TOKEN }}
6259
project: Random Quotes
6360
server: ${{ secrets.OCTOPUS_SERVER_URL }}
6461
deploy_to: Dev
65-
packages: ${{ steps.get_octopus_artifact.outputs.octoversion }}
62+
packages: Deploy container to Kubernetes:randomquotes:${{ steps.determine_version.outputs.semVer }}

0 commit comments

Comments
 (0)