diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 9a3589671..046d3318a 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -32,6 +32,7 @@ jobs: uses: actions/checkout@v4 with: token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }} + - uses: dorny/paths-filter@v2 id: filter with: @@ -42,6 +43,7 @@ jobs: - '.github/actions/changelog/action.yml' dist: - '.github/actions/changelog/dist/**' + - name: Latest tag id: get-latest-tag uses: ./.github/actions/describe @@ -49,6 +51,7 @@ jobs: token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }} branch: develop stable: false + - name: Update version number id: changelog uses: ./.github/actions/changelog @@ -57,6 +60,7 @@ jobs: version-path: VERSION token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }} basehead: ${{ steps.get-latest-tag.outputs.tag }}...${{ github.sha }} + - name: Commit if: ${{ steps.changelog.outputs.message != 'noop' }} uses: EndBug/add-and-commit@v9 diff --git a/.github/workflows/man_0_assign_version.yml b/.github/workflows/man_0_assign_version.yml index ea7650e3e..b9ce3d410 100644 --- a/.github/workflows/man_0_assign_version.yml +++ b/.github/workflows/man_0_assign_version.yml @@ -23,7 +23,7 @@ on: type: boolean required: true default: true - description: "WARNING: Make sure the `nightly-tests` workflow has passed successfully before running this workflow. + description: "WARNING: Make sure the `nightly-tests` or the most recent `tests` workflow has passed successfully in develop before running this workflow. Uncheck this box if it has." permissions: diff --git a/CHANGELOG.md b/CHANGELOG.md index 41ad2a0d1..ef578f48f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Operations -- Split the `nightly` workflow into 4 manually triggerable workflows, `nightly-tests`, `man_0_assign_version`, `man_1_push_to_master`, and `man_2_create_release` to be run in this order. +- Added qelectron tests to the `tests` workflow +- Split the `nightly` workflow into 4 manually triggerable workflows, `nightly-tests`, `man_0_assign_version`, `man_1_push_to_master`, and `man_2_create_prerelease` to be run in this order. - Now only the `nightly-tests` workflow will be run on a daily basis, and the other 3 workflows will be run manually. - Removed `conda` releases from `release.yml`. - When pushing to `master`, now the version numbers of `develop` and `master` will be compared in `man_1_push_to_master`. @@ -43,10 +44,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed the SQLAlchemy warning that used to show up at every fresh server start - Fixed deploy commands' default value of plugins not being propagated to the tfvars file -### Operations - -- Added qelectron tests to the `tests` workflow - ## [0.233.0-rc.0] - 2024-01-07 ### Authors