mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-14 20:30:31 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5b2ab9932 | ||
| 5a32a5908b | |||
| b7df0bfdcd | |||
| 378d1d60f1 |
11
.github/workflows/ci.yml
vendored
11
.github/workflows/ci.yml
vendored
@@ -64,6 +64,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.head_ref }} == '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,7 +81,7 @@ 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'
|
if: github.head_ref == 'master' || github.head_ref == 'dev'
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user