Revert "Include changes to the target branch when action is re-run"

[simonjbeaumont]

Reverts #58

This has resulted in a destructive outcome for developers using act to 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:

-    uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@814f5831ccc6aac159903e8db6daba726c8b62d5

I'm sympathetic to the motivation behind the PR but I think we should revert immediately to avoid others hitting this.

[simonjbeaumont]

//cc @shahmishal @ahoppen @ktoso @rnro

[simonjbeaumont]

Thanks for merging promptly.

I'm finished for today now but I think we could investigate using a conditional here on the CI environment variable and only have this behaviour if running in CI. I believe we have a similar behaviour somewhere else already but I'm on a mobile device so can't validate right now.

[ahoppen]

Sorry for breaking the act workflow @simonjbeaumont and thanks for reverting my change.

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.

[simonjbeaumont]

@ahoppen Looks like we can use job.if here with an environment variable that's only set when using act:

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 if: env.ACT != 'true' to the steps. I'll open a PR to reintroduce the change.