Compare commits

...

18 Commits

2 changed files with 13 additions and 6 deletions

View File

@@ -12,7 +12,6 @@ on:
- "**/CHANGELOG.md" - "**/CHANGELOG.md"
pull_request: pull_request:
branches: branches:
- master
- dev - dev
workflow_dispatch: workflow_dispatch:
@@ -46,7 +45,7 @@ jobs:
tag_and_publish: tag_and_publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.head_ref == 'master' || github.head_ref == 'dev' if: github.ref_name == 'master' || github.ref_name == 'dev'
needs: test needs: test
permissions: permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
@@ -56,7 +55,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-tags: true fetch-tags: true
ref: ${{ github.head_ref }} ref: ${{ github.ref_name }}
fetch-depth: 0 fetch-depth: 0
- name: setup git - name: setup git
@@ -64,6 +63,15 @@ jobs:
git config --local user.email "15138480+creyD@users.noreply.github.com" git config --local user.email "15138480+creyD@users.noreply.github.com"
git config --local user.name "creyD" git config --local user.name "creyD"
- name: set version format
id: version_format
run: |
if [[ ${{ github.ref_name }} == 'master' ]]; then
echo "version_format=\${major}.\${minor}.\${patch}" >> $GITHUB_OUTPUT
else
echo "version_format=\${major}.\${minor}.\${patch}rc\${increment}" >> $GITHUB_OUTPUT
fi
- name: Git Version - name: Git Version
uses: PaulHatch/semantic-version@v5.4.0 uses: PaulHatch/semantic-version@v5.4.0
id: git_version id: git_version
@@ -72,10 +80,9 @@ jobs:
major_pattern: "breaking:" major_pattern: "breaking:"
minor_pattern: "feat:" minor_pattern: "feat:"
enable_prerelease_mode: false enable_prerelease_mode: false
version_format: "${major}.${minor}.${patch}rc${increment}" version_format: ${{ steps.version_format.outputs.version_format }}
- name: Create & Push Tag - name: Create & Push Tag
if: github.head_ref == 'master' || github.head_ref == 'dev'
run: | run: |
git tag ${{ steps.git_version.outputs.version }} git tag ${{ steps.git_version.outputs.version }}
git push origin ${{ steps.git_version.outputs.version }} git push origin ${{ steps.git_version.outputs.version }}

View File

@@ -107,7 +107,7 @@ def paginate(
count_query = create_count_query(query) count_query = create_count_query(query)
total = connection.scalar(count_query) total = connection.scalar(count_query)
if paginationFlag is False: if paginationFlag is False and total > 0:
params = Params(page=1, size=total) params = Params(page=1, size=total)
query = create_paginate_query(query, params) query = create_paginate_query(query, params)