mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-12 19:30:30 +02:00
Compare commits
27 Commits
2.0.0-rc+7
...
2.0.2rc0
| Author | SHA1 | Date | |
|---|---|---|---|
| c8c5977978 | |||
| 974bc591d6 | |||
| eb895398ab | |||
| 867abd7054 | |||
| 26e18f6b31 | |||
| 8a3a60dbb0 | |||
| e52a5f421b | |||
| a6ded91185 | |||
| eb64874c47 | |||
| b7200852a4 | |||
| 3d18205205 | |||
| 99c84b676c | |||
| 6806de23b3 | |||
| 6a93ab05a3 | |||
|
|
c5b2ab9932 | ||
| 5a32a5908b | |||
| b7df0bfdcd | |||
| 378d1d60f1 | |||
| e381992f8e | |||
| 6d5411a8ae | |||
| 89351d714b | |||
| c24f8933fb | |||
| 0bed0e0da4 | |||
| 8463eef907 | |||
| 5903de2aad | |||
| 0bf89fe14d | |||
| d54146e05b |
36
.github/workflows/ci.yml
vendored
36
.github/workflows/ci.yml
vendored
@@ -6,14 +6,12 @@ on:
|
||||
- master
|
||||
- dev
|
||||
paths-ignore:
|
||||
- "**/.github/**"
|
||||
- "**/.gitignore"
|
||||
- "**/.vscode/**"
|
||||
- "**/README.md"
|
||||
- "**/CHANGELOG.md"
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- dev
|
||||
workflow_dispatch:
|
||||
|
||||
@@ -47,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
|
||||
@@ -57,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
|
||||
@@ -65,25 +63,29 @@ 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: codacy/git-version@2.8.0
|
||||
uses: PaulHatch/semantic-version@v5.4.0
|
||||
id: git_version
|
||||
with:
|
||||
minor-identifier: "feat:"
|
||||
major-identifier: "breaking:"
|
||||
release-branch: ${{ github.head_ref }}
|
||||
tag_prefix: ""
|
||||
major_pattern: "breaking:"
|
||||
minor_pattern: "feat:"
|
||||
enable_prerelease_mode: false
|
||||
version_format: ${{ steps.version_format.outputs.version_format }}
|
||||
|
||||
- name: Create & Push Tag
|
||||
if: github.head_ref == 'master' || github.head_ref == 'dev'
|
||||
run: |
|
||||
if [ "${{ github.head_ref }}" == "master" ]; then
|
||||
git tag ${{ steps.git_version.outputs.version }}
|
||||
git push origin ${{ steps.git_version.outputs.version }}
|
||||
elif [ "${{ github.head_ref }}" == "dev" ]; then
|
||||
calculatedSha=$(git rev-parse --short ${{ github.sha }})
|
||||
git tag ${{ steps.git_version.outputs.version }}-rc+${calculatedSha}
|
||||
git push origin ${{ steps.git_version.outputs.version }}-rc+${calculatedSha}
|
||||
fi
|
||||
git tag ${{ steps.git_version.outputs.version }}
|
||||
git push origin ${{ steps.git_version.outputs.version }}
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user