From 95371ef1e348cd742449b8df311b1670286dbdb2 Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 1 Feb 2022 16:24:18 +0100 Subject: [PATCH] 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