From 51701dd5d7cb29e38bb4226c136a67ec6250e3d8 Mon Sep 17 00:00:00 2001 From: Luca Palmieri <20745048+LukeMathWalker@users.noreply.github.com> Date: Thu, 25 Apr 2024 22:14:54 +0200 Subject: [PATCH] chore: CI fixes (#279) - Move the changelog to a location where `cargo-dist` will pick it up. It currently doesn't allow configuring the expected path, which is annoying. - Fix permissions for job that re-enables workspace hack - Fix bash in the contributors workflow --- .github/workflows/contributors.yml | 4 ++-- .github/workflows/enable-workspace-hack.yml | 2 +- libs/.release-plz.toml | 2 +- CHANGELOG.md => libs/CHANGELOG.md | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename CHANGELOG.md => libs/CHANGELOG.md (100%) diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index e0a28109..56b73f4b 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -16,11 +16,11 @@ jobs: run: | pr_author=$(jq -r .pull_request.user.login "$GITHUB_EVENT_PATH") - if "$pr_author" == "dependabot[bot]"; then + if [ "$pr_author" = "dependabot[bot]" ]; then echo "PR author is dependabot[bot]" exit 0 fi - if "$pr_author" == "pavex-releaser[bot]"; then + if [ "$pr_author" = "pavex-releaser[bot]" ]; then echo "PR author is pavex-releaser[bot]" exit 0 fi diff --git a/.github/workflows/enable-workspace-hack.yml b/.github/workflows/enable-workspace-hack.yml index fcef9318..198c69a3 100644 --- a/.github/workflows/enable-workspace-hack.yml +++ b/.github/workflows/enable-workspace-hack.yml @@ -1,7 +1,7 @@ name: Re-enable workspace hack after a release permissions: - contents: write + pull-requests: write on: push: diff --git a/libs/.release-plz.toml b/libs/.release-plz.toml index 0f75b154..90d130c7 100644 --- a/libs/.release-plz.toml +++ b/libs/.release-plz.toml @@ -12,6 +12,6 @@ allow_dirty = true name = "pavex" changelog_update = true changelog_include = ["pavex_cli", "pavexc", "pavexc_cli", "pavex_tracing", "pavex_cli_client", "pavexc_cli_client", "pavex_macros", "pavex_reflection", "pavex_miette", "pavex_bp_schema"] -changelog_path = "../CHANGELOG.md" +changelog_path = "CHANGELOG.md" git_tag_name = "{{ version }}" git_tag_enable = true diff --git a/CHANGELOG.md b/libs/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to libs/CHANGELOG.md