Compare commits

...

9 Commits

2 changed files with 16 additions and 5 deletions

View File

@@ -19,6 +19,7 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
if: github.ref_name != 'master'
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable
@@ -35,6 +36,7 @@ jobs:
test:
runs-on: ubuntu-latest
needs: lint
if: github.ref_name != 'master'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
@@ -46,7 +48,7 @@ jobs:
tag_and_publish:
runs-on: ubuntu-latest
if: github.head_ref == 'master' || github.head_ref == 'dev'
if: github.ref_name == 'dev' || github.ref_name == 'master'
needs: test
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
@@ -56,7 +58,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-tags: true
ref: ${{ github.head_ref }}
ref: ${{ github.ref_name }}
fetch-depth: 0
- name: setup git
@@ -64,6 +66,15 @@ jobs:
git config --local user.email "15138480+creyD@users.noreply.github.com"
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
uses: PaulHatch/semantic-version@v5.4.0
id: git_version
@@ -72,10 +83,10 @@ jobs:
major_pattern: "breaking:"
minor_pattern: "feat:"
enable_prerelease_mode: false
version_format: "${major}.${minor}.${patch}rc${increment}"
version_format: ${{ steps.version_format.outputs.version_format }}
- name: Create & Push Tag
if: github.head_ref == 'master' || github.head_ref == 'dev'
if: github.ref_name == 'master' || github.ref_name == 'dev'
run: |
git tag ${{ 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)
total = connection.scalar(count_query)
if paginationFlag is False:
if paginationFlag is False and total > 0:
params = Params(page=1, size=total)
query = create_paginate_query(query, params)