diff --git a/.github/workflows/daily-version.yml b/.github/workflows/daily-version.yml index a09dff6..24092ae 100644 --- a/.github/workflows/daily-version.yml +++ b/.github/workflows/daily-version.yml @@ -55,8 +55,15 @@ jobs: if: env.NEW_VERSION run: | # Get the PR number from the previous step - PR_NUMBER=$(gh pr list --head "release/${{ env.NEW_VERSION }}" --json number --jq '.[0].number') + PR_NUMBER=$(gh pr list --head "release/$NEW_VERSION" --json number --jq '.[0].number') if [ -n "$PR_NUMBER" ]; then + # Trigger the test workflow manually for this PR + gh workflow run tests.yml --ref "release/$NEW_VERSION" + echo "Triggered test workflow for branch release/$NEW_VERSION" + + # Wait a moment for the workflow to start + sleep 10 + gh pr merge $PR_NUMBER --auto --squash echo "Auto-merge enabled for PR #$PR_NUMBER" fi diff --git a/.github/workflows/package-extension.yml b/.github/workflows/package-extension.yml index 5a5d3a9..b59c894 100644 --- a/.github/workflows/package-extension.yml +++ b/.github/workflows/package-extension.yml @@ -83,5 +83,12 @@ jobs: --base main \ --head "$BRANCH_NAME") + # Trigger the test workflow manually for this PR to ensure tests run + gh workflow run tests.yml --ref "$BRANCH_NAME" + echo "Triggered test workflow for branch $BRANCH_NAME" + + # Wait a moment for the workflow to start + sleep 10 + # Enable auto-merge with squash strategy gh pr merge "$PR_URL" --auto --squash