diff --git a/.forgejo/workflows/pr.yml b/.forgejo/workflows/pr.yml index fe1de2c0..ba873732 100644 --- a/.forgejo/workflows/pr.yml +++ b/.forgejo/workflows/pr.yml @@ -13,9 +13,8 @@ jobs: - name: get forgejo.org and move the docs run: | git clone --recursive --depth 1 https://codeberg.org/forgejo/website/ /tmp/website - rm -fr /tmp/website/forgejo-docs/${{ env.GITHUB_BASE_REF }} - mkdir -p /tmp/website/forgejo-docs/${{ env.GITHUB_BASE_REF }} - cp -a * /tmp/website/forgejo-docs/${{ env.GITHUB_BASE_REF }} + apt-get update -qq && apt-get install -qq -y rsync + rsync -av --delete ./ /tmp/website/forgejo-docs/${{ env.GITHUB_BASE_REF }}/ - name: install run: | cd /tmp/website diff --git a/.forgejo/workflows/push.yml b/.forgejo/workflows/push.yml new file mode 100644 index 00000000..5f431889 --- /dev/null +++ b/.forgejo/workflows/push.yml @@ -0,0 +1,28 @@ +name: push + +on: + push: + branches: + - 'next' + - 'v1.21' + - 'v1.20' + - 'v1.19' + +jobs: + publish: + runs-on: docker + steps: + - name: update the website submodules + if: ${{ secrets.WEBSITETOKEN != '' }} + run: | + git clone --recursive https://forgejo-website:${{ secrets.WEBSITETOKEN }}@codeberg.org/forgejo/website + cd website + git submodule update --remote + git config user.email "ci@forgejo.org" ; git config user.name "forgejo-website" + git add . + if git diff-index --quiet HEAD ; then + echo Nothing changed, not pushing + else + git commit -m 'publish' -a + git push + fi diff --git a/README.md b/README.md index 1e67a293..d5982c5c 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ Each time a new major version of Forgejo is released, a new branch will be created in this repo to document the stable release. Current release branches are as follows: + - [`next`](https://codeberg.org/forgejo/docs/src/branch/next) - [`v1.20`](https://codeberg.org/forgejo/docs/src/branch/v1.20) - [`v1.19`](https://codeberg.org/forgejo/docs/src/branch/v1.19) Documentation content lives in the `docs` subfolder, and images in the `images` subfolder. - ## Contributing ### Pull Requests @@ -25,8 +25,8 @@ Documentation content lives in the `docs` subfolder, and images in the `images` PRs should usually be sent against the [`next`](https://codeberg.org/forgejo/docs/src/branch/next) branch. Sometimes it will be appropriate to send a PR against a specific release branch if the changes only affect that release. -Most changes should either be sent as a *single commit per PR*, or should be squashed before merging. -*Fast-forwarding is the preferred merge strategy.* +Most changes should either be sent as a _single commit per PR_, or should be squashed before merging. +_Fast-forwarding is the preferred merge strategy._ Changes can then be backported (or if appropriate frontported) by cherry-picking. Rarely, it will make sense to create a feature branch containting a series of commits that will @@ -46,7 +46,6 @@ Look at existing links for examples. Images should use relative URLs to the image files, which will be published at `https://forgejo.org/images/{{version}}/`. - ## Code of Conduct All contributors are required to abide by the [Forgejo Code of Conduct](https://codeberg.org/forgejo/code-of-conduct). @@ -54,7 +53,6 @@ All contributors are required to abide by the [Forgejo Code of Conduct](https:// Feel free to reach out to the [moderation team](https://codeberg.org/forgejo/governance/src/branch/main/TEAMS.md#moderation) in case of any conflicts. - ## License The documentation content originates from several different sources and each page has a different license.