Merge pull request '[FORGEJO] cosmetic change' (#96) from wip-cascading-pr into main

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/96
pull/97/head
earl-warren 2023-10-24 22:44:39 +00:00
commit 7e9d43667b
3 changed files with 5 additions and 1 deletions

View File

@ -12,3 +12,4 @@ branch=$(jq --raw-output .head.ref < $runner_pr)
test "$branch" != null test "$branch" != null
cd $setup_forgejo cd $setup_forgejo
./utils/upgrade-runner.sh $url @$branch ./utils/upgrade-runner.sh $url @$branch
date > last-upgrade

View File

@ -20,4 +20,5 @@ jobs:
destination-repo: actions/setup-forgejo destination-repo: actions/setup-forgejo
destination-branch: main destination-branch: main
destination-token: ${{ secrets.CASCADING_PR_DESTINATION }} destination-token: ${{ secrets.CASCADING_PR_DESTINATION }}
close-merge: true
update: .forgejo/cascading-pr-setup-forgejo update: .forgejo/cascading-pr-setup-forgejo

View File

@ -97,7 +97,9 @@ create a network that cannot reach the forgejo instance.
### Try a sample workflow ### 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 ```yaml
on: [push] on: [push]