diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 1e61660..36fa2d0 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v3.0.2 + uses: https://code.forgejo.org/actions/setup-forgejo@v3.0.1 with: user: root password: admin1234 diff --git a/README.md b/README.md index 1c4b957..1267e85 100644 --- a/README.md +++ b/README.md @@ -87,9 +87,8 @@ not exist, it is created. | destination-branch | the base branch of the destination repository for the cascading PR | `true` | | | destination-token | a token with write permission on destination-repo | `true` | | | update | path to the script to update the content of the cascading PR | `true` | | -| wait-iteration | number of seconds to wait before verifying for the status of the destination pull request (timeout after 100 iterations) | `true` | 36 | | prefix | prefix of the branch from which the cascading PR is created on {destination-repo} or {destination-fork-repo} (default to {origin-repo}) | `false` | | -| close | if true the cascading PR will be closed and the branch deleted when (i) the {origin-pr} is merged or (ii) when the cascading PR status is success if {origin-ref} is set | `false` | false | +| close | if true the cascading PR will be closed and the branch deleted when the PR is merged | `false` | false | | verbose | if true print verbose information | `false` | false | | debug | if true print debug information | `false` | false | @@ -101,13 +100,15 @@ linked with workflows using `cascading-pr` as follows. ```mermaid flowchart TD - lxc-helper(lxc-helper) --> runner(runner) + lxc-helper(lxc-helper) --> act(act) + act --> runner(Forgejo runner) runner --> setup-forgejo(setup-forgejo) setup-forgejo --> e2e(end-to-end) forgejo-curl(forgejo-curl.sh) --> setup-forgejo forgejo(forgejo) --> e2e - click lxc-helper "https://code.forgejo.org/forgejo/lxc-helpers/src/branch/main/.forgejo/workflows/cascade-runner.yml" + click lxc-helper "https://code.forgejo.org/forgejo/lxc-helpers/src/branch/main/.forgejo/workflows/cascade-act.yml" + click act "https://code.forgejo.org/forgejo/act/src/branch/main/.forgejo/workflows/cascade-runner.yml" click runner "https://code.forgejo.org/forgejo/runner/src/branch/main/.forgejo/workflows/cascade-setup-forgejo.yml" click setup-forgejo "https://code.forgejo.org/actions/setup-forgejo/src/branch/main/.forgejo/workflows/cascade-end-to-end.yml" click e2e "https://code.forgejo.org/actions/end-to-end" diff --git a/action.yml b/action.yml index 6734afe..755770d 100644 --- a/action.yml +++ b/action.yml @@ -101,10 +101,6 @@ inputs: update: description: 'path to the script to update the content of the cascading PR' required: true - wait-iteration: - description: 'number of seconds to wait before verifying for the status of the destination pull request (timeout after 100 iterations)' - default: 36 - required: true prefix: description: 'prefix of the branch from which the cascading PR is created on {destination-repo} or {destination-fork-repo} (default to {origin-repo})' close: @@ -147,7 +143,6 @@ runs: --destination-token "@$destination_token" \ --destination-branch "${{ inputs.destination-branch }}" \ --update "${{ inputs.update }}" \ - --wait-iteration "${{ inputs.wait-iteration }}" \ --prefix "${{ inputs.prefix }}" \ --close "${{ inputs.close }}" \ run diff --git a/cascading-pr-lib.sh b/cascading-pr-lib.sh index 4ad2c42..06f3dad 100644 --- a/cascading-pr-lib.sh +++ b/cascading-pr-lib.sh @@ -27,10 +27,6 @@ function dependencies() { fi } -function set_loop_delay() { - LOOP_DELAY="$1" -} - function retry() { rm -f $TMPDIR/retry.{out,attempt,err} local success=false diff --git a/cascading-pr.sh b/cascading-pr.sh index f6aa74c..99f3c81 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -401,7 +401,6 @@ function finalize_options() { else options[destination_is_fork]=false fi - set_loop_delay ${options[wait_iteration]} : ${options[close]:=false} } @@ -544,11 +543,6 @@ function main() { options[update]=$1 shift ;; - --wait-iteration) - shift - options[wait_iteration]=$1 - shift - ;; --prefix) shift options[prefix]=$1