diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f680634d8..bcfb91ce5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: Exit if any RC release + if: contains(github.ref, 'rc') == false + uses: everlytic/branch-merge@1.1.2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_ref: "develop" + target_branch: "latest" + commit_message_template: 'RELEASE: :shipit: :boom: :tada: Merged {source_ref} into target {target_branch}' - name: Release uses: softprops/action-gh-release@v1 with: diff --git a/.github/workflows/sync-to-readthedocs-repo.yaml b/.github/workflows/sync-to-readthedocs-repo.yaml index e42ead615..281f1c31e 100644 --- a/.github/workflows/sync-to-readthedocs-repo.yaml +++ b/.github/workflows/sync-to-readthedocs-repo.yaml @@ -6,6 +6,7 @@ on: branches: - main - latest + - develop - 'pre/*' - 'v*' diff --git a/docs/index.rst b/docs/index.rst index d0ed1b78f..70ab03cff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -165,9 +165,8 @@ This will produce the following plot, which visualizes the electromagnetic field .. image:: _static/quickstart_fields.png :width: 1200 -a) Postprocess simulation data using the same python session, or -b) View the results of this simulation on our web-based `graphical user interface `_. +You can now postprocess simulation data using the same python session, or view the results of this simulation on our web-based `graphical user interface `_. .. `TODO: open example in colab `_