From 3e9f4cf08c94a48abba29c50f2c67aeb040f7e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20R=C3=B6der?= <33963579+yannick-roeder@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:30:30 +0100 Subject: [PATCH 01/11] Cleanup code owners (#231) --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 3f00b4261..e05182471 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @yannick-roeder @MichaelKora @yordanovsstoyan +* @yannick-roeder @DerTiedemann From 62382697acb1e1e30ac079fb566f6b77eb40a9e7 Mon Sep 17 00:00:00 2001 From: Salomon Popp Date: Wed, 8 Jan 2025 14:30:39 +0100 Subject: [PATCH 02/11] Allow configuring changelog file for bump-version-release workflow (#234) --- .github/workflows/bump-version-release.yaml | 7 ++++++- docs/workflows/bump-version-release/README.md | 13 +++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bump-version-release.yaml b/.github/workflows/bump-version-release.yaml index 15d416df9..351f562eb 100644 --- a/.github/workflows/bump-version-release.yaml +++ b/.github/workflows/bump-version-release.yaml @@ -13,6 +13,11 @@ on: required: false default: true type: boolean + changelog-file: + description: Path to the changelog file in the GitHub repository + required: false + default: "CHANGELOG.md" + type: string changelog-config: description: "Changelog config path." required: false @@ -74,7 +79,7 @@ jobs: with: github-token: ${{ secrets.github-token }} tag: ${{ steps.bump-version.outputs.release-version }} - changelog-file: CHANGELOG.md + changelog-file: ${{ inputs.changelog-file }} - name: Commit and push changes including .bumpversion.cfg file uses: bakdata/ci-templates/actions/commit-and-push@v1.6.0 diff --git a/docs/workflows/bump-version-release/README.md b/docs/workflows/bump-version-release/README.md index 2f70664a3..5353de368 100644 --- a/docs/workflows/bump-version-release/README.md +++ b/docs/workflows/bump-version-release/README.md @@ -61,12 +61,13 @@ jobs: -| INPUT | TYPE | REQUIRED | DEFAULT | DESCRIPTION | -| ----------------- | ------- | -------- | ------- | --------------------------------------------------------------- | -| changelog | boolean | false | `true` | Create changelog for release. | -| changelog-config | string | false | | Changelog config path. | -| release-type | string | true | | Scope of the release (major, minor or patch). | -| working-directory | string | false | `"."` | Working directory containing `.bumpversion.cfg`. (Default is .) | +| INPUT | TYPE | REQUIRED | DEFAULT | DESCRIPTION | +| ----------------- | ------- | -------- | ---------------- | --------------------------------------------------------------- | +| changelog | boolean | false | `true` | Create changelog for release. | +| changelog-config | string | false | | Changelog config path. | +| changelog-file | string | false | `"CHANGELOG.md"` | Path to the changelog file in the GitHub repository | +| release-type | string | true | | Scope of the release (major, minor or patch). | +| working-directory | string | false | `"."` | Working directory containing `.bumpversion.cfg`. (Default is .) | From b3a514a630940728ad27d5c959af8f9c2e2e98de Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Wed, 8 Jan 2025 13:31:09 +0000 Subject: [PATCH 03/11] =?UTF-8?q?Bump=20version=201.50.4=20=E2=86=92=201.5?= =?UTF-8?q?1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 0bb26ca1d..5240cc2ec 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,2 +1,2 @@ [bumpversion] -current_version = 1.50.4 +current_version = 1.51.0 From 6ff89390e6a0cf3e7ea780dc350201c36439ec30 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Fri, 10 Jan 2025 11:20:07 +0100 Subject: [PATCH 04/11] Configure Sonarqube properties (#236) - host - project name - project key --- .github/workflows/java-gradle-base.yaml | 2 +- .github/workflows/java-gradle-docker.yaml | 2 +- .github/workflows/java-gradle-library.yaml | 2 +- .github/workflows/java-gradle-plugin.yaml | 2 +- .../action.yaml | 26 +++++++++++++++---- .../java-gradle-assess-code-quality/README.md | 7 +++-- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.github/workflows/java-gradle-base.yaml b/.github/workflows/java-gradle-base.yaml index 0a9041b6c..2069c9d5b 100644 --- a/.github/workflows/java-gradle-base.yaml +++ b/.github/workflows/java-gradle-base.yaml @@ -104,7 +104,7 @@ jobs: needs: test steps: - name: Assess code quality - uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.49.0 + uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.52.0 with: download-lfs-files: ${{ inputs.download-lfs-files }} gradle-cache: ${{ inputs.gradle-cache }} diff --git a/.github/workflows/java-gradle-docker.yaml b/.github/workflows/java-gradle-docker.yaml index d64de88a6..db7ab6f1d 100644 --- a/.github/workflows/java-gradle-docker.yaml +++ b/.github/workflows/java-gradle-docker.yaml @@ -88,7 +88,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.49.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.52.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-library.yaml b/.github/workflows/java-gradle-library.yaml index 286699e2f..c24cddf33 100644 --- a/.github/workflows/java-gradle-library.yaml +++ b/.github/workflows/java-gradle-library.yaml @@ -73,7 +73,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.49.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.52.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-plugin.yaml b/.github/workflows/java-gradle-plugin.yaml index e366db68f..f65ee6445 100644 --- a/.github/workflows/java-gradle-plugin.yaml +++ b/.github/workflows/java-gradle-plugin.yaml @@ -79,7 +79,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.49.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.52.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml index 277401a72..9497e852e 100644 --- a/actions/java-gradle-assess-code-quality/action.yaml +++ b/actions/java-gradle-assess-code-quality/action.yaml @@ -40,10 +40,20 @@ inputs: description: "Key ring (base64 encoded) for signing the Sonatype publication." required: false sonar-organization: - description: "Organization for Sonarcloud." + description: "Organization for Sonarqube." required: false sonar-token: - description: "Token for Sonarcloud." + description: "Token for Sonarqube." + required: false + sonar-host: + description: "Host for Sonarqube." + required: false + default: "https://sonarcloud.io" + sonar-project-key: + description: "Project key for Sonarqube." + required: false + sonar-project-name: + description: "Project name for Sonarqube." required: false working-directory: description: "Working directory of your Gradle artifacts. (Default is .)" @@ -52,7 +62,6 @@ inputs: runs: using: "composite" - if: "!contains(github.repository, 'playground')" steps: - name: Check out repository uses: bakdata/ci-templates/actions/checkout@1.49.0 @@ -70,8 +79,15 @@ runs: # sonar.branch.autoconfig.disabled is necessary for autocreation of projects on Sonarcloud to work - name: Assess code quality - if: ${{ inputs.sonar-token != '' && inputs.sonar-organization != '' }} - run: ./gradlew -Dsonar.branch.autoconfig.disabled=true -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=${{ inputs.sonar-organization }} --info --stacktrace sonarqube ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} + if: ${{ inputs.sonar-token != '' }} + run: | + ./gradlew -Dsonar.branch.autoconfig.disabled=true \ + -Dsonar.host.url=${{ inputs.sonar-host }} \ + ${{ (inputs.sonar-organization != '' && format('-Dsonar.organization={0}', inputs.sonar-organization)) || '' }} \ + ${{ (inputs.sonar-project-key != '' && format('-Dsonar.projectKey={0}', inputs.sonar-project-key)) || '' }} \ + ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \ + --info --stacktrace sonarqube \ + ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} shell: bash working-directory: ${{ inputs.working-directory }} env: diff --git a/docs/actions/java-gradle-assess-code-quality/README.md b/docs/actions/java-gradle-assess-code-quality/README.md index 78b954d1a..51bfb0f58 100644 --- a/docs/actions/java-gradle-assess-code-quality/README.md +++ b/docs/actions/java-gradle-assess-code-quality/README.md @@ -38,8 +38,11 @@ steps: | signing-key-id | string | false | | Key id for signing the Sonatype publication. | | signing-password | string | false | | Password for signing the Sonatype publication. | | signing-secret-key-ring | string | false | | Key ring (base64 encoded) for signing the Sonatype publication. | -| sonar-organization | string | false | | Organization for Sonarcloud. | -| sonar-token | string | false | | Token for Sonarcloud. | +| sonar-host | string | false | `"https://sonarcloud.io"` | Host for Sonarqube. | +| sonar-organization | string | false | | Organization for Sonarqube. | +| sonar-project-key | string | false | | Project key for Sonarqube. | +| sonar-project-name | string | false | | Project name for Sonarqube. | +| sonar-token | string | false | | Token for Sonarqube. | | working-directory | string | false | `"."` | Working directory of your Gradle artifacts. (Default is .) | From 30b8efdcb70d1e833954a170befd9fed92742106 Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Fri, 10 Jan 2025 10:20:38 +0000 Subject: [PATCH 05/11] =?UTF-8?q?Bump=20version=201.51.0=20=E2=86=92=201.5?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5240cc2ec..52d3e137e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,2 +1,2 @@ [bumpversion] -current_version = 1.51.0 +current_version = 1.52.0 From 8baa28613f11933339a329ff3c94d161792c7746 Mon Sep 17 00:00:00 2001 From: Jakob Edding <15202881+JakobEdding@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:27:00 +0100 Subject: [PATCH 06/11] Simplify getting current time for Poetry dev releases (#237) --- actions/python-poetry-bump-version/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/python-poetry-bump-version/action.yaml b/actions/python-poetry-bump-version/action.yaml index b825d577f..f5084301b 100644 --- a/actions/python-poetry-bump-version/action.yaml +++ b/actions/python-poetry-bump-version/action.yaml @@ -49,7 +49,7 @@ runs: run: | echo "old-version=$(poetry version -s)" >> $GITHUB_OUTPUT if [[ "${{ inputs.release-type }}" == "snapshot" ]]; then - snapshot_time=$(python -c "from datetime import datetime; time = datetime.now(); print(time.strftime('%Y%m%d%H%M%S'))") + snapshot_time=$(date +'%Y%m%d%H%M%S') poetry version patch poetry version $(poetry version -s).dev$snapshot_time else From 96cee871e592297ae790788e947650d40593b48c Mon Sep 17 00:00:00 2001 From: DerTiedemann Date: Tue, 14 Jan 2025 20:00:04 +0100 Subject: [PATCH 07/11] Fix cliff custom config detection for changelog generation (#240) --- actions/changelog-generate/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/changelog-generate/action.yaml b/actions/changelog-generate/action.yaml index b4f339188..30db41e45 100644 --- a/actions/changelog-generate/action.yaml +++ b/actions/changelog-generate/action.yaml @@ -43,7 +43,7 @@ runs: id: get-config-path run: | DEFAULT_PATH=$GITHUB_ACTION_PATH/default-cliff.toml - if [-f cliff.toml ]; then + if [ -f cliff.toml ]; then cp cliff.toml tmp_cliff.toml else cp $DEFAULT_PATH tmp_cliff.toml From bd26ad916d8a7d2f3c2bf0592966e3da3571636b Mon Sep 17 00:00:00 2001 From: Salomon Popp Date: Wed, 15 Jan 2025 10:31:02 +0100 Subject: [PATCH 08/11] Pre-bump changelog-generate action (#241) --- .github/workflows/bump-version-release.yaml | 2 +- .github/workflows/python-poetry-release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version-release.yaml b/.github/workflows/bump-version-release.yaml index 351f562eb..b7c254d51 100644 --- a/.github/workflows/bump-version-release.yaml +++ b/.github/workflows/bump-version-release.yaml @@ -74,7 +74,7 @@ jobs: - name: Create changelog id: build-changelog - uses: bakdata/ci-templates/actions/changelog-generate@1.50.0 + uses: bakdata/ci-templates/actions/changelog-generate@1.52.1 if: ${{ inputs.changelog }} with: github-token: ${{ secrets.github-token }} diff --git a/.github/workflows/python-poetry-release.yaml b/.github/workflows/python-poetry-release.yaml index febe50a1c..8b6e87232 100644 --- a/.github/workflows/python-poetry-release.yaml +++ b/.github/workflows/python-poetry-release.yaml @@ -91,7 +91,7 @@ jobs: - name: Create changelog id: build-changelog - uses: bakdata/ci-templates/actions/changelog-generate@1.50.0 + uses: bakdata/ci-templates/actions/changelog-generate@1.52.1 if: ${{ inputs.changelog }} with: github-token: ${{ secrets.github-token }} From fbcf560d196e8967a3a58eb761474f5dff7b879d Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Wed, 15 Jan 2025 09:32:35 +0000 Subject: [PATCH 09/11] =?UTF-8?q?Bump=20version=201.52.0=20=E2=86=92=201.5?= =?UTF-8?q?2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 52d3e137e..6979a7764 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,2 +1,2 @@ [bumpversion] -current_version = 1.52.0 +current_version = 1.52.1 From 867882b95aae28168a62147c26b5d2b1427bc49b Mon Sep 17 00:00:00 2001 From: Jakob Edding <15202881+JakobEdding@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:29:46 +0100 Subject: [PATCH 10/11] Make Docker image tags available in running container (#239) --- .github/workflows/docker-build-and-publish.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml index 605f1c073..8e53b97db 100644 --- a/.github/workflows/docker-build-and-publish.yaml +++ b/.github/workflows/docker-build-and-publish.yaml @@ -117,12 +117,22 @@ jobs: env: DOCKER_METADATA_PR_HEAD_SHA: true # set correct sha for PRs + - name: Prepare build args + id: args + run: | + { + echo "build-args<> "$GITHUB_OUTPUT" + - name: Build and push uses: docker/build-push-action@v5 with: context: ${{ inputs.docker-context }} file: ${{ inputs.dockerfile-path }} - build-args: ${{ inputs.docker-build-args }} + build-args: ${{ steps.args.outputs.build-args }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 337393788a082777d25c9cce0f27be4d30a06317 Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Wed, 15 Jan 2025 12:30:39 +0000 Subject: [PATCH 11/11] =?UTF-8?q?Bump=20version=201.52.1=20=E2=86=92=201.5?= =?UTF-8?q?3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6979a7764..989e2490a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,2 +1,2 @@ [bumpversion] -current_version = 1.52.1 +current_version = 1.53.0