From d93d0c04a1580c410565de960680f3900363f908 Mon Sep 17 00:00:00 2001 From: Alec Geatches Date: Thu, 10 Apr 2025 15:24:01 -0600 Subject: [PATCH 1/3] Remove leading whitespace, add milestone to bump-version workflow --- .github/workflows/bump-version.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index bf394541e7..08e615e850 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -105,7 +105,7 @@ jobs: - name: Format the version changelog run: | - PARSELY_RELEASE_LOG=$(printf '%s' "$PARSELY_RELEASE_LOG" | sed 's/###/##/g') + PARSELY_RELEASE_LOG=$(printf '%s' "$PARSELY_RELEASE_LOG" | sed 's/###/##/g' | sed 's/^[[:space:]]*//') echo $PARSELY_RELEASE_LOG # Write the multiline variable to $GITHUB_ENV using the correct syntax echo "PARSELY_RELEASE_LOG<> $GITHUB_ENV @@ -120,4 +120,5 @@ jobs: $PARSELY_RELEASE_LOG" \ --base ${{ github.ref_name }} \ --head update/wp-parsely-version-to-${{ env.NEW_VERSION }} \ - --assignee ${{ github.actor }} + --assignee ${{ github.actor }} \ + --milestone ${{ env.NEW_VERSION }} From 22e59b22b69b098a2541659bda9c6e36219d6887 Mon Sep 17 00:00:00 2001 From: Alec Geatches Date: Thu, 10 Apr 2025 15:24:26 -0600 Subject: [PATCH 2/3] Modify release-plugin workflow to remove remote dry-run tags --- .github/workflows/release-plugin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-plugin.yml b/.github/workflows/release-plugin.yml index 26a2767887..97c58f091a 100644 --- a/.github/workflows/release-plugin.yml +++ b/.github/workflows/release-plugin.yml @@ -142,9 +142,10 @@ jobs: TAG_NAME="${{ env.VERSION }}" if ${{ env.DRY_RUN }}; then TAG_NAME="dry-run-${{ env.VERSION }}" - # If the tag already exists, delete the tag + # If the tag already exists, delete it both locally and remotely if git tag --list | grep -q "${TAG_NAME}"; then git tag -d "${TAG_NAME}" + git push --delete origin ":refs/tags/${TAG_NAME}" || true fi fi From 43bb69e6de0598ffb3b8bb15abf90e502601637a Mon Sep 17 00:00:00 2001 From: Alec Geatches Date: Mon, 14 Apr 2025 13:39:47 -0600 Subject: [PATCH 3/3] Fix unrelated test failure --- src/content-helper/editor-sidebar/class-editor-sidebar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content-helper/editor-sidebar/class-editor-sidebar.php b/src/content-helper/editor-sidebar/class-editor-sidebar.php index b737c75929..c0b3ea354a 100644 --- a/src/content-helper/editor-sidebar/class-editor-sidebar.php +++ b/src/content-helper/editor-sidebar/class-editor-sidebar.php @@ -106,11 +106,11 @@ private function get_parsely_post_url( $post_id = null, bool $add_utm_params = t /** * The post object. * - * @var WP_Post $post + * @var WP_Post|null $post */ $post = get_post( $post_id ); - if ( ! Dashboard_Link::can_show_link( $post, $this->parsely ) ) { + if ( null === $post || ! Dashboard_Link::can_show_link( $post, $this->parsely ) ) { return null; }