Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/update-depend…
Browse files Browse the repository at this point in the history
…encies

# Conflicts:
#	build.gradle.kts
  • Loading branch information
philipp94831 committed Feb 7, 2024
2 parents d02b291 + 29e07b0 commit 7749ccb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build-and-publish:
name: Java Gradle Docker
uses: bakdata/ci-templates/.github/workflows/java-gradle-docker.yaml@1.39.0
uses: bakdata/ci-templates/.github/workflows/java-gradle-docker.yaml@1.40.5
with:
java-version: 17
docker-publisher: "bakdata"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
java-gradle-release:
name: Java Gradle
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.39.0
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.5
with:
java-version: 17
release-type: "${{ inputs.release-type }}"
Expand Down

0 comments on commit 7749ccb

Please sign in to comment.