Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix/ci' into feature/test-improv…
Browse files Browse the repository at this point in the history
…ements

# Conflicts:
#	.github/workflows/build-and-publish.yaml
#	.github/workflows/helm-publish.yaml
#	.github/workflows/release.yaml
  • Loading branch information
philipp94831 committed Jan 16, 2025
2 parents 9cffdcf + 0dbeb38 commit 8759f60
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 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
uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.49.0
uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.53.1
with:
java-version: 17
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Lint Helm chart
uses: bakdata/ci-templates/actions/helm-lint@1.46.3
uses: bakdata/ci-templates/actions/helm-lint@1.53.1
with:
lint-config-path: ".github/lint-config.yaml"
ref: ${{ github.ref_name }}
7 changes: 4 additions & 3 deletions .github/workflows/helm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: bakdata/ci-templates/actions/checkout@1.32.0

- name: Set up Gradle with version ${{ inputs.gradle-version }}
uses: bakdata/ci-templates/actions/java-gradle-setup@1.49.0
uses: bakdata/ci-templates/actions/java-gradle-setup@1.53.1
with:
java-distribution: "microsoft"
java-version: "11"
Expand All @@ -29,9 +29,10 @@ jobs:
echo "version=$version" >> "$GITHUB_OUTPUT"
shell: bash

call-workflow-passing-data:

helm-publish:
name: Publish Helm chart
uses: bakdata/ci-templates/.github/workflows/helm-multi-release.yaml@1.49.0
uses: bakdata/ci-templates/.github/workflows/helm-multi-release.yaml@fix/helm-multi-release
needs: get-gradle-version
with:
charts-path: "./charts"
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.49.0
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.53.1
with:
java-version: 17
release-type: "${{ inputs.release-type }}"
Expand Down

0 comments on commit 8759f60

Please sign in to comment.