diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 01195c9..aeb8b26 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -11,6 +11,7 @@ on: [push] jobs: check-semantic-version: + if: "!contains(github.event.head_commit.message, 'skipci')" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -29,7 +30,7 @@ jobs: run: check-semantic-version setup.py run-tests: - if: "!contains(github.event.head_commit.message, 'skip_ci_tests')" + if: "!contains(github.event.head_commit.message, 'skipci')" runs-on: ubuntu-latest env: USING_COVERAGE: '3.8' @@ -55,7 +56,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} publish: - if: "!contains(github.event.head_commit.message, 'skip_ci_publish')" + if: "!contains(github.event.head_commit.message, 'skipci')" runs-on: ubuntu-latest needs: [check-semantic-version, run-tests] steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62538ba..a3db3f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ on: jobs: release: # This job will only run if the PR has been merged (and not closed without merging). - if: "github.event.pull_request.merged == true && !contains(github.event.pull_request.head.message, 'skip_ci_release')" + if: "github.event.pull_request.merged == true && !contains(github.event.pull_request.head.message, 'skipci')" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/update-pull-request.yml b/.github/workflows/update-pull-request.yml index 3672f6d..c7b3885 100644 --- a/.github/workflows/update-pull-request.yml +++ b/.github/workflows/update-pull-request.yml @@ -14,7 +14,6 @@ on: jobs: description: - if: "!contains(github.event.head_commit.message, 'skip_ci_update_description')" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -26,7 +25,7 @@ jobs: - name: Compile new pull request description run: | echo 'PULL_REQUEST_NOTES<> $GITHUB_ENV - echo "$(compile-release-notes LAST_RELEASE ${{ github.event.pull_request.url }} ${{ secrets.GITHUB_TOKEN }})" >> $GITHUB_ENV + echo "$(compile-release-notes PULL_REQUEST_START --pull-request-url=${{ github.event.pull_request.url }} --api-token=${{ secrets.GITHUB_TOKEN }})" >> $GITHUB_ENV echo EOF >> $GITHUB_ENV - name: Update pull request body uses: riskledger/update-pr-description@v2 diff --git a/mkver.conf b/mkver.conf index f93d0e6..0370c28 100644 --- a/mkver.conf +++ b/mkver.conf @@ -5,7 +5,7 @@ defaults { preReleaseFormat: "RC{PreReleaseNumber}" buildMetaDataFormat: "{Branch}.{ShortHash}" includeBuildMetaData: false - whenNoValidCommitMessages: NoIncrement + whenNoValidCommitMessages: IncrementPatch patches: [setup.py] } @@ -23,21 +23,19 @@ patches: [ ] commitMessageActions: [ -# Disable major version increments while package is still in beta (i.e. keep the version below 1.0.0). -# { -# pattern: "BREAKING CHANGE|BREAKING-CHANGE" -# action: IncrementMajor -# } - -# All new features require a minor version increase. + # Disable major version increments while package is still in beta (i.e. keep the version below 1.0.0). { - pattern: "FEA:" + pattern: "BREAKING CHANGE" + action: IncrementMinor + } + { + pattern: "BREAKING-CHANGE" action: IncrementMinor } -# Any other changes, including bug fixes, require a patch version increase. + # All new features require a minor version increase. { - pattern: ".*" - action: IncrementPatch + pattern: "FEA:" + action: IncrementMinor } ] diff --git a/setup.py b/setup.py index 25605bd..9bff06d 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( name="twined", - version="0.0.25", + version="0.0.26", py_modules=[], install_requires=["jsonschema ~= 3.2.0", "python-dotenv"], url="https://www.github.com/octue/twined",