From 70229bafb97cbff478950779e9cf80180972a8d9 Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 14:49:46 +0200 Subject: [PATCH 1/6] Split start and other event with the github action --- .github/workflows/initialyse_data.yml | 20 --------------- .github/workflows/pr_main.yml | 2 +- .github/workflows/pr_main_start.yml | 36 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/pr_main_start.yml diff --git a/.github/workflows/initialyse_data.yml b/.github/workflows/initialyse_data.yml index 89dd570..a6449bd 100644 --- a/.github/workflows/initialyse_data.yml +++ b/.github/workflows/initialyse_data.yml @@ -26,17 +26,6 @@ jobs: version_draft: ${{ steps.semantic_setup.outputs.draft }} version_name: ${{ steps.semantic_setup.outputs.version }} 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 id: get_semantic_setup uses: oprypin/find-latest-tag@v1.1.0 @@ -46,15 +35,6 @@ jobs: prefix: 'v' 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 id: semantic_setup run: | diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml index 00ea4b8..7d0dc5f 100644 --- a/.github/workflows/pr_main.yml +++ b/.github/workflows/pr_main.yml @@ -5,7 +5,7 @@ on: branches: [main] types: - [opened, edited, synchronize, closed] + [edited, synchronize, closed] jobs: diff --git a/.github/workflows/pr_main_start.yml b/.github/workflows/pr_main_start.yml new file mode 100644 index 0000000..f69b105 --- /dev/null +++ b/.github/workflows/pr_main_start.yml @@ -0,0 +1,36 @@ +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 + + - name: Increment a new release + 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 + + unit-test: + uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main From 3e5c19cdb345869cd782a56841df62554c0e0ded Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 14:52:17 +0200 Subject: [PATCH 2/6] Clear file --- .github/workflows/generate_release.yml | 29 -------------------------- .github/workflows/pr_main.yml | 7 ------- 2 files changed, 36 deletions(-) delete mode 100644 .github/workflows/generate_release.yml diff --git a/.github/workflows/generate_release.yml b/.github/workflows/generate_release.yml deleted file mode 100644 index fcdbb2d..0000000 --- a/.github/workflows/generate_release.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml index 00b3c96..b3eaac5 100644 --- a/.github/workflows/pr_main.yml +++ b/.github/workflows/pr_main.yml @@ -13,13 +13,6 @@ jobs: name: Initialize all data about the package 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: uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main From 3a7ca1e818ff10ee7d3b6e94546008be94c36a52 Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 15:05:22 +0200 Subject: [PATCH 3/6] Clear the PR main file --- .github/workflows/pr_main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml index b3eaac5..c721d2d 100644 --- a/.github/workflows/pr_main.yml +++ b/.github/workflows/pr_main.yml @@ -20,7 +20,6 @@ jobs: name: Generate archive package addon needs: - init-release-data - - prepare-first-release - unit-test uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_addon.yml@main with: @@ -32,7 +31,6 @@ jobs: name: Generate archive package preset needs: - init-release-data - - prepare-first-release - unit-test uses: Moderlab-Production/BlenderTemplate/.github/workflows/package_preset.yml@main with: From ecb99fe439c5c89fc615fd60ee2b0eddc1f18148 Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 20:12:11 +0200 Subject: [PATCH 4/6] Add tag prefix with the start PR --- .github/workflows/pr_main_start.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_main_start.yml b/.github/workflows/pr_main_start.yml index f69b105..ef20463 100644 --- a/.github/workflows/pr_main_start.yml +++ b/.github/workflows/pr_main_start.yml @@ -31,6 +31,7 @@ jobs: bump: ${{ steps.bump_setup.outputs.type }} github_token: ${{ secrets.GITHUB_TOKEN }} dry_run: true + prefix: v unit-test: uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main From efdbd8fc115e9c75ed84f1895348833edc3f06d5 Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 20:23:47 +0200 Subject: [PATCH 5/6] Add tag prefix on start PR --- .github/workflows/pr_main_start.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_main_start.yml b/.github/workflows/pr_main_start.yml index ef20463..26d39f8 100644 --- a/.github/workflows/pr_main_start.yml +++ b/.github/workflows/pr_main_start.yml @@ -24,9 +24,9 @@ jobs: echo "::set-output name=type::patch" fi - - name: Increment a new release - id: new_semantic_setup + - 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 }} From bc32af501b164c50de89197e1d148d48cbe41704 Mon Sep 17 00:00:00 2001 From: stilobique Date: Mon, 30 May 2022 21:47:30 +0200 Subject: [PATCH 6/6] Update the setup PR --- .github/version.py | 2 +- .github/workflows/pr_main_start.yml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/version.py b/.github/version.py index 3e1ce68..f086507 100644 --- a/.github/version.py +++ b/.github/version.py @@ -13,7 +13,7 @@ class SetupVersion: def update_addon_init(self): """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: with open(self.addon_file, "r") as f: diff --git a/.github/workflows/pr_main_start.yml b/.github/workflows/pr_main_start.yml index 26d39f8..99a5157 100644 --- a/.github/workflows/pr_main_start.yml +++ b/.github/workflows/pr_main_start.yml @@ -24,6 +24,8 @@ jobs: 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 @@ -33,5 +35,12 @@ jobs: 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