Merge remote-tracking branch 'origin/main'

This commit is contained in:
Aurelien Vaillant
2022-06-07 18:04:26 +02:00
5 changed files with 48 additions and 60 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ class SetupVersion:
def update_addon_init(self): def update_addon_init(self):
"""Simple function to update the bl_info to set the Git tag release""" """Simple function to update the bl_info to set the Git tag release"""
regex, update = r'[0-9]{1,2}\, [0-9]{1,2}\, [0-9{1,2}]', '' regex, update = r'[0-9]{1,2}\, [0-9]{1,2}\, [0-9]{1,2}', ''
try: try:
with open(self.addon_file, "r") as f: with open(self.addon_file, "r") as f:
-29
View File
@@ -1,29 +0,0 @@
name: Create base release
on:
workflow_call:
inputs:
bump_version:
description: 'The bump release'
type: string
required: true
default: 'patch'
jobs:
init-release-data:
name: Generate data about the release
runs-on: ubuntu-latest
steps:
- name: Debug Data
run: |
echo "show the bump config"
echo ${{ inputs.bump_version }}
- name: Setup a new Semantic Version
id: new_semantic_setup
if: ${{ github.event.action == 'opened' }}
uses: zwaldowski/semver-release-action@v2
with:
bump: ${{ inputs.bump_version }}
github_token: ${{ secrets.GITHUB_TOKEN }}
dry_run: true
-20
View File
@@ -26,17 +26,6 @@ jobs:
version_draft: ${{ steps.semantic_setup.outputs.draft }} version_draft: ${{ steps.semantic_setup.outputs.draft }}
version_name: ${{ steps.semantic_setup.outputs.version }} version_name: ${{ steps.semantic_setup.outputs.version }}
steps: steps:
- name: Setup bump release
id: bump_setup
run: |
if [ ${{ contains(github.event.pull_request.labels.*.name, 'release:major') }} == true ]; then
echo "::set-output name=type::major"
elif [ ${{ contains(github.event.pull_request.labels.*.name, 'release:minor') }} == true ]; then
echo "::set-output name=type::minor"
else
echo "::set-output name=type::patch"
fi
- name: Get the Semantic tag Version - name: Get the Semantic tag Version
id: get_semantic_setup id: get_semantic_setup
uses: oprypin/find-latest-tag@v1.1.0 uses: oprypin/find-latest-tag@v1.1.0
@@ -46,15 +35,6 @@ jobs:
prefix: 'v' prefix: 'v'
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Increment if a new release are needed to generated
if: ${{ github.event.action == 'opened' }}
id: new_semantic_setup
uses: zwaldowski/semver-release-action@v2
with:
bump: ${{ steps.bump_setup.outputs.type }}
github_token: ${{ secrets.GITHUB_TOKEN }}
dry_run: true
- name: From all use case, get the Tag version - name: From all use case, get the Tag version
id: semantic_setup id: semantic_setup
run: | run: |
+1 -10
View File
@@ -5,7 +5,7 @@ on:
branches: branches:
[main] [main]
types: types:
[opened, edited, synchronize, closed] [edited, synchronize, closed]
jobs: jobs:
@@ -13,13 +13,6 @@ jobs:
name: Initialize all data about the package name: Initialize all data about the package
uses: Moderlab-Production/BlenderTemplate/.github/workflows/initialize_data.yml@main uses: Moderlab-Production/BlenderTemplate/.github/workflows/initialize_data.yml@main
prepare-first-release:
name: Make the pre-release
needs: init-release-data
uses: Moderlab-Production/BlenderTemplate/.github/workflows/generate_release.yml@main
with:
bump_version: ${{ needs.init-release-data.outputs.version_type }}
unit-test: unit-test:
uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main
@@ -27,7 +20,6 @@ jobs:
name: Generate archive package addon name: Generate archive package addon
needs: needs:
- init-release-data - init-release-data
- prepare-first-release
- unit-test - unit-test
uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_addon.yml@main uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_addon.yml@main
with: with:
@@ -39,7 +31,6 @@ jobs:
name: Generate archive package preset name: Generate archive package preset
needs: needs:
- init-release-data - init-release-data
- prepare-first-release
- unit-test - unit-test
uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_preset.yml@main uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_preset.yml@main
with: with:
+46
View File
@@ -0,0 +1,46 @@
name: Create addon release
on:
pull_request:
branches:
[main]
types:
[opened]
jobs:
init-release:
name: Generate the release
runs-on: ubuntu-latest
steps:
- name: Setup bump release
id: bump_setup
run: |
if [ ${{ contains(github.event.pull_request.labels.*.name, 'release:major') }} == true ]; then
echo "::set-output name=type::major"
elif [ ${{ contains(github.event.pull_request.labels.*.name, 'release:minor') }} == true ]; then
echo "::set-output name=type::minor"
else
echo "::set-output name=type::patch"
fi
- uses: actions/checkout@main
- name: Create new Semantic Version
uses: zwaldowski/semver-release-action@v2
id: new_semantic_setup
with:
bump: ${{ steps.bump_setup.outputs.type }}
github_token: ${{ secrets.GITHUB_TOKEN }}
dry_run: true
prefix: v
- name: Make the github release
uses: ncipollo/release-action@v1.10.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
prerelease: true
tag: ${{ steps.new_semantic_setup.outputs.version_tag }}
unit-test:
uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main