mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-13 11:50:31 +02:00
Compare commits
14 Commits
2.0.0-rc+7
...
2.0.0rc28
| Author | SHA1 | Date | |
|---|---|---|---|
| 6806de23b3 | |||
|
|
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,7 +6,6 @@ on:
|
|||||||
- master
|
- master
|
||||||
- dev
|
- dev
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- "**/.github/**"
|
|
||||||
- "**/.gitignore"
|
- "**/.gitignore"
|
||||||
- "**/.vscode/**"
|
- "**/.vscode/**"
|
||||||
- "**/README.md"
|
- "**/README.md"
|
||||||
@@ -47,7 +46,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 == 'dev' || github.ref_name == 'master' && github.event_name == 'push'
|
||||||
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
|
||||||
@@ -57,7 +56,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
|
||||||
@@ -65,25 +64,30 @@ 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: codacy/git-version@2.8.0
|
uses: PaulHatch/semantic-version@v5.4.0
|
||||||
id: git_version
|
id: git_version
|
||||||
with:
|
with:
|
||||||
minor-identifier: "feat:"
|
tag_prefix: ""
|
||||||
major-identifier: "breaking:"
|
major_pattern: "breaking:"
|
||||||
release-branch: ${{ github.head_ref }}
|
minor_pattern: "feat:"
|
||||||
|
enable_prerelease_mode: false
|
||||||
|
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.ref_name == 'master' || github.ref_name == 'dev'
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ github.head_ref }}" == "master" ]; then
|
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 }}
|
|
||||||
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
|
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
|
|||||||
@@ -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