diff --git a/.forgejo/cascading-pr-setup-forgejo b/.forgejo/cascading-pr-setup-forgejo index 8e9c59f..39a72b8 100755 --- a/.forgejo/cascading-pr-setup-forgejo +++ b/.forgejo/cascading-pr-setup-forgejo @@ -12,3 +12,4 @@ branch=$(jq --raw-output .head.ref < $runner_pr) test "$branch" != null cd $setup_forgejo ./utils/upgrade-runner.sh $url @$branch +date > last-upgrade diff --git a/.forgejo/workflows/cascade-setup-forgejo.yml b/.forgejo/workflows/cascade-setup-forgejo.yml index fcfb558..5f6e122 100644 --- a/.forgejo/workflows/cascade-setup-forgejo.yml +++ b/.forgejo/workflows/cascade-setup-forgejo.yml @@ -20,4 +20,5 @@ jobs: destination-repo: actions/setup-forgejo destination-branch: main destination-token: ${{ secrets.CASCADING_PR_DESTINATION }} + close-merge: true update: .forgejo/cascading-pr-setup-forgejo diff --git a/README.md b/README.md index 92593c2..f62fe70 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,9 @@ create a network that cannot reach the forgejo instance. ### Try a sample workflow -From the Forgejo web interface, create a repository and add the following to `.forgejo/workflows/try.yaml`. It will launch the job and the result can be observed from the `actions` tab. +From the Forgejo web interface, create a repository and add the +following to `.forgejo/workflows/try.yaml`. It will launch the job and +the result can be observed from the `actions` tab. ```yaml on: [push]