Revert "Include changes to the target branch when action is re-run" #60
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
//cc @shahmishal @ahoppen @ktoso @rnro |
shahmishal
approved these changes
Nov 7, 2024
|
Thanks for merging promptly. I'm finished for today now but I think we could investigate using a conditional here on the |
|
Sorry for breaking the If you have an example of how you guard behavior on the CI environment, I’d be interested to see that and check if we can apply it here as well. |
|
@ahoppen Looks like we can use jobs:
foo:
runs-on: ubuntu-latest
name: Foo
steps:
- name: Dump env
run: env | sort
- name: Echo always
run: echo "always"
- name: Echo only if FOO=true
if: env.FOO == 'true'
run: echo "job running with FOO set to true"
- name: Echo only if not FOO=true
if: env.FOO != 'true'
run: echo "job not running with FOO set to true"
- name: Echo only if running with act
if: env.ACT == 'true'
run: echo "job running with ACT"
- name: Echo only if not running with act
if: env.ACT != 'true'
run: echo "job not running with act"% act -j foo
[PR/Foo] ✅ Success - Main Dump env
[PR/Foo] ⭐ Run Main Echo always
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/1] user= workdir=
| always
[PR/Foo] ✅ Success - Main Echo always
[PR/Foo] ⭐ Run Main Echo only if not FOO=true
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/3] user= workdir=
| job not running with FOO set to true
[PR/Foo] ✅ Success - Main Echo only if not FOO=true
[PR/Foo] ⭐ Run Main Echo only if running with act
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/4] user= workdir=
| job running with ACT
[PR/Foo] ✅ Success - Main Echo only if running with act
[PR/Foo] Cleaning up container for job Foo
[PR/Foo] 🏁 Job succeeded
% act -j foo --env FOO=false
[PR/Foo] ✅ Success - Main Dump env
[PR/Foo] ⭐ Run Main Echo always
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/1] user= workdir=
| always
[PR/Foo] ✅ Success - Main Echo always
[PR/Foo] ⭐ Run Main Echo only if not FOO=true
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/3] user= workdir=
| job not running with FOO set to true
[PR/Foo] ✅ Success - Main Echo only if not FOO=true
[PR/Foo] ⭐ Run Main Echo only if running with act
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/4] user= workdir=
| job running with ACT
[PR/Foo] ✅ Success - Main Echo only if running with act
[PR/Foo] Cleaning up container for job Foo
[PR/Foo] 🏁 Job succeeded
% act -j foo --env FOO=true
[PR/Foo] ✅ Success - Main Dump env
[PR/Foo] ⭐ Run Main Echo always
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/1] user= workdir=
| always
[PR/Foo] ✅ Success - Main Echo always
[PR/Foo] ⭐ Run Main Echo only if FOO=true
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/2] user= workdir=
| job running with FOO set to true
[PR/Foo] ✅ Success - Main Echo only if FOO=true
[PR/Foo] ⭐ Run Main Echo only if running with act
[PR/Foo] 🐳 docker exec cmd=[bash -e /var/run/act/workflow/4] user= workdir=
| job running with ACT
[PR/Foo] ✅ Success - Main Echo only if running with act
[PR/Foo] Cleaning up container for job Foo
[PR/Foo] 🏁 Job succeeded
So I think it will just be adding |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #58
This has resulted in a destructive outcome for developers using
actto run the workflows locally, which is also in our public documentation now, particularly when used with--bind.This patch recreates the entire repo and force updates to a ref. It literally deleted my Git repo and left me with a grafted shallow clone. It discarded all my local branches and no reflog was available.
We need to revert this one quickly.
I've verified that the revert mitigates the problem by making this change in my YAMLs locally, to the commit before this PR was merged:
I'm sympathetic to the motivation behind the PR but I think we should revert immediately to avoid others hitting this.