Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/maven.yml
  • Loading branch information
mcasperson committed Jan 30, 2023
2 parents 78e7c34 + cd72c52 commit b7714d3
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_SAMPLES_USERNAME }}
password: ${{ secrets.DOCKERHUB_SAMPLES_PASSWORD }}
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].7
uses: gittools/actions/gitversion/[email protected].14
with:
versionSpec: 5.x
- id: determine_version
name: Determine Version
uses: gittools/actions/gitversion/[email protected].7
uses: gittools/actions/gitversion/[email protected].14
with:
additionalArguments: /overrideconfig mode=Mainline
- name: Install Octopus Deploy CLI
Expand All @@ -36,9 +36,6 @@ jobs:
with:
java-version: '17'
distribution: adopt
- name: Set Version
run: ./mvnw --batch-mode versions:set -DnewVersion=${{ steps.determine_version.outputs.semVer }}
shell: bash
- name: Test
run: ./mvnw --batch-mode test
shell: bash
Expand All @@ -54,12 +51,12 @@ jobs:
uses: docker/build-push-action@v3
with:
push: true
tags: octopussamples/randomquotesjava:latest
tags: octopussamples/randomquotesjava:${{ steps.determine_version.outputs.semVer }}
- name: Create Octopus Release
uses: OctopusDeploy/[email protected]
with:
api_key: ${{ secrets.OCTOPUS_API_TOKEN }}
project: Random Quotes
server: ${{ secrets.OCTOPUS_SERVER_URL }}
deploy_to: Dev
packages: ${{ steps.get_octopus_artifact.outputs.octoversion }}
packages: Deploy container to Kubernetes:randomquotes:${{ steps.determine_version.outputs.semVer }}

0 comments on commit b7714d3

Please sign in to comment.