Compare commits

...

19 Commits

Author SHA1 Message Date
c8c5977978 fix: removed non-working backsync 2024-10-29 16:20:01 +01:00
974bc591d6 Merge pull request #11 from creyD/dev 2024-10-29 15:49:00 +01:00
eb895398ab fix: trying again to fix the pipeline 2024-10-29 15:46:52 +01:00
867abd7054 fix: fixed workflow again 2024-10-29 15:33:54 +01:00
26e18f6b31 Merge pull request #10 from creyD/dev 2024-10-29 15:32:28 +01:00
8a3a60dbb0 fix: fixed workflow again 2024-10-29 15:30:42 +01:00
e52a5f421b Merge pull request #9 from creyD/dev 2024-10-29 15:23:41 +01:00
a6ded91185 fix: syncing back tags to dev 2024-10-29 15:18:57 +01:00
eb64874c47 fix: minor adjustment to the pipeline 2024-10-29 15:13:36 +01:00
b7200852a4 Merge branch 'dev' of https://github.com/creyD/creyPY into dev 2024-10-29 15:13:30 +01:00
3d18205205 fix: fixed github pipeline 2024-10-29 15:12:41 +01:00
99c84b676c Merge pull request #8 from creyD/dev 2024-10-29 15:09:34 +01:00
6806de23b3 fix: fixed github pipeline 2024-10-29 15:06:31 +01:00
6a93ab05a3 Merge pull request #6 from creyD/dev 2024-10-29 14:56:14 +01:00
vikynoah
c5b2ab9932 fix: Add condition for total greater than zero (#7) 2024-10-28 15:37:14 +01:00
5a32a5908b Removed debug statement 2024-10-25 15:34:16 +02:00
b7df0bfdcd fix: added escape for variable names 2024-10-25 15:27:50 +02:00
378d1d60f1 fix: adjusting pipeline for prod as well 2024-10-25 15:22:35 +02:00
e381992f8e fix: fixing dev versioning 2024-10-25 15:09:15 +02:00
2 changed files with 10 additions and 15 deletions

View File

@@ -12,7 +12,6 @@ on:
- "**/CHANGELOG.md"
pull_request:
branches:
- master
- dev
workflow_dispatch:
@@ -46,7 +45,7 @@ jobs:
tag_and_publish:
runs-on: ubuntu-latest
if: github.head_ref == 'master' || github.head_ref == 'dev'
if: github.ref_name == 'master' || github.ref_name == 'dev'
needs: test
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
@@ -56,7 +55,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,18 +63,15 @@ jobs:
git config --local user.email "15138480+creyD@users.noreply.github.com"
git config --local user.name "creyD"
- name: Set version format
id: set_version
- name: set version format
id: version_format
run: |
if [[ "${{ github.head_ref }}" == "master" ]]; then
echo "V_FORMAT=${major}.${minor}.${patch}" >> $GITHUB_ENV
elif [[ "${{ github.head_ref }}" == "dev" ]]; then
echo "V_FORMAT=${major}.${minor}.${patch}-prerelease${increment}" >> $GITHUB_ENV
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: get version format
run: echo "${{ steps.set_version.outputs.V_FORMAT }}" >> $GITHUB_STEP_SUMMARY
- name: Git Version
uses: PaulHatch/semantic-version@v5.4.0
id: git_version
@@ -84,10 +80,9 @@ jobs:
major_pattern: "breaking:"
minor_pattern: "feat:"
enable_prerelease_mode: false
version_format: "${major}.${minor}.${patch}-prerelease${increment}"
version_format: ${{ steps.version_format.outputs.version_format }}
- name: Create & Push Tag
if: github.head_ref == 'master' || github.head_ref == '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)