From 95371ef1e348cd742449b8df311b1670286dbdb2 Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 1 Feb 2022 16:24:18 +0100 Subject: [PATCH 1/3] Clear unused workflow Update the main pull request workflow --- .github/workflows/feature.yml | 17 ----------------- .github/workflows/pr_main.yml | 12 ++++-------- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/feature.yml diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml deleted file mode 100644 index 8a0766d..0000000 --- a/.github/workflows/feature.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Test and Package feature branchs - -on: - push: - branches-ignore: - [main, develop] - - -jobs: - unit-test: - uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main - - generate-package: - uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@main - with: - num_version: '0.0.0' - name_version: 'v0.0.0' \ No newline at end of file diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml index c20b651..7c398e7 100644 --- a/.github/workflows/pr_main.yml +++ b/.github/workflows/pr_main.yml @@ -1,7 +1,6 @@ name: Create addon release on: - workflow_call: pull_request: branches: [main] @@ -27,8 +26,7 @@ jobs: prepare-first-release: name: Make the pre-release - needs: - - init-release-data + needs: init-release-data if: ${{ github.event.action == 'opened' }} uses: Moderlab-Production/BlenderTemplate/.github/workflows/generate_release.yml@main with: @@ -40,7 +38,8 @@ jobs: release-package: name: Generate archive package needs: - - init-release-data + - prepare-first-release + - unit-test uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@main with: num_version: ${{ needs.init-release-data.outputs.version_number }} @@ -49,10 +48,7 @@ jobs: publish-release: name: Publish the Github Release - needs: - - unit-test - - init-release-data - - release-package + needs: release-package runs-on: ubuntu-latest steps: - name: Debug the release From 3ed0003182460d69f0a19eb6054fde5c3c6d04fd Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 1 Feb 2022 16:49:43 +0100 Subject: [PATCH 2/3] Add some debug information --- .github/workflows/generate_release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate_release.yml b/.github/workflows/generate_release.yml index 044f1b1..1b1700c 100644 --- a/.github/workflows/generate_release.yml +++ b/.github/workflows/generate_release.yml @@ -7,13 +7,18 @@ on: description: 'The bump release' type: string required: true - default: 'false' + 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 uses: zwaldowski/semver-release-action@v2 From 32cdfbb4332f0db70b342f62f6606e198d957d70 Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 1 Feb 2022 16:51:08 +0100 Subject: [PATCH 3/3] Add debug with init data --- .github/workflows/initialyse_data.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/initialyse_data.yml b/.github/workflows/initialyse_data.yml index 0ea2b55..01719d8 100644 --- a/.github/workflows/initialyse_data.yml +++ b/.github/workflows/initialyse_data.yml @@ -61,3 +61,8 @@ jobs: echo "::set-output name=version::${tag:1}" echo "::set-output name=draft::true" fi + + - name: Debug Data + run: | + echo "show the bump config" + echo ${{ steps.bump_setup.outputs.type }}