diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f906d87f8..aea449933 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: GH_TOKEN: ${{ secrets.RELEASE_PAT }} run: | PR_NUMBER=$(gh pr list --head release/${{ steps.bump_version.outputs.version }} --json number -q '.[0].number') - gh pr merge $PR_NUMBER --merge --admin + gh pr merge $PR_NUMBER --merge --admin --delete-branch - name: Tag release if: success() @@ -87,6 +87,29 @@ jobs: git tag -f ${{ steps.bump_version.outputs.version }} git push -f origin ${{ steps.bump_version.outputs.version }} + - name: Sync version to staging + if: success() + env: + GH_TOKEN: ${{ secrets.RELEASE_PAT }} + run: | + VERSION=${{ steps.bump_version.outputs.version }} + BRANCH=chore/sync-version-$VERSION + git fetch origin staging + git checkout -B $BRANCH origin/staging + for f in package.json packages/client/package.json packages/server/package.json; do + sed -i -E "s/(\"version\": \")[^\"]+(\")/\1$VERSION\2/" "$f" + done + git add -A + git commit -m "chore: sync release version $VERSION to staging [skip ci]" \ + || { echo "Staging already at $VERSION, nothing to sync"; exit 0; } + git push -f origin $BRANCH + gh pr create \ + --base staging \ + --head $BRANCH \ + --title "Sync version $VERSION to staging" \ + --body "Automated sync of released version \`$VERSION\` back to staging." \ + || echo "PR already exists" + # ------------------------ # Publish (DockerHub) # ------------------------ @@ -99,6 +122,8 @@ jobs: steps: - uses: actions/checkout@v6 + with: + ref: ${{ needs.release.outputs.release_version }} - name: Docker login run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin @@ -118,6 +143,8 @@ jobs: steps: - uses: actions/checkout@v6 + with: + ref: ${{ needs.release.outputs.release_version }} - name: Docker login run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin diff --git a/README.md b/README.md index 6752eab8a..b77cfee0b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Kotahi -[Website](https://kotahi.community/) -Join our [chat channel](https://mattermost.coko.foundation/coko/channels/kotahi). +[Website](https://kotahi.foundation/) +Contact us [here](https://elifepathways.org/#get-involved) Kotahi is a modern submission, review and publishing system especially suited for academic journals, overlay journals, preprint curation groups, data publications, data review, research labs and PRC (publish-review-curate) groups. Kotahi supports: @@ -20,11 +20,7 @@ Kotahi is a modern submission, review and publishing system especially suited fo - modern interfaces, architecture, thinking -Kotahi is currently under development by the [Kotahi Foundation](https://kotahi.foundation/). - -## Project roadmap - -[The Kotahi product roadmap](https://miro.com/app/board/uXjVLmKGfek=/) can be viewed on Miro. +Kotahi is currently under development by [eLife Pathways](https://elifepathways.org/). ## Bug reporting