From 55f8126069a56b53cbb3eab6be7527273bf2cb4c Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 12 Mar 2024 14:16:01 +0000 Subject: [PATCH] ci: Fix Action update auto-merging --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3c4762d0c4..34ae2779b7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -47,7 +47,7 @@ jobs: Cargo.lock outputs: is_dependabot: ${{ github.actor == 'dependabot[bot]' }} - any_changed: ${{ steps.build.outputs.any_changed == 'true' || steps.actions.outputs.any_change == 'true' || steps.cargo.outputs.any_change == 'true' || steps.rust.outputs.any_changed == 'true' }} + any_changed: ${{ steps.build.outputs.any_changed == 'true' || steps.actions.outputs.any_changed == 'true' || steps.cargo.outputs.any_change == 'true' || steps.rust.outputs.any_changed == 'true' }} build_changed: ${{ steps.build.outputs.any_changed }} actions_changed: ${{ steps.build.outputs.any_changed == 'true' || steps.actions.outputs.any_changed == 'true' }} cargo_changed: ${{ steps.cargo.outputs.any_changed == 'true' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 204a4db2af..759b3b39fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,6 +46,8 @@ jobs: echo archs='["amd64"]' ) >> "$GITHUB_OUTPUT" fi + + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: changed uses: tj-actions/changed-files@aa08304bd477b800d468db44fe10f6c61f7f7b11 with: @@ -53,6 +55,7 @@ jobs: .github/workflows/release.yml justfile Cargo.toml + outputs: changed: ${{ steps.changed.outputs.any_changed }} archs: ${{ steps.meta.outputs.archs }}