From 378583e958f09ded09a3532cfdc1d6d161966e07 Mon Sep 17 00:00:00 2001 From: Aurelien Vaillant Date: Mon, 31 Jan 2022 11:23:50 +0100 Subject: [PATCH] Update the github CI, set the repository has a public repo --- .github/workflows/feature.yml | 5 +++-- .github/workflows/init_release.yml | 3 ++- .github/workflows/package.yml | 8 +++----- .github/workflows/pr_main.yml | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml index c1bfd4e..8a0766d 100644 --- a/.github/workflows/feature.yml +++ b/.github/workflows/feature.yml @@ -5,12 +5,13 @@ on: branches-ignore: [main, develop] + jobs: unit-test: - uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@develop + uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main generate-package: - uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@develop + 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/init_release.yml b/.github/workflows/init_release.yml index f9a9023..e6a4398 100644 --- a/.github/workflows/init_release.yml +++ b/.github/workflows/init_release.yml @@ -7,6 +7,7 @@ on: types: [opened] + jobs: create-release: name: Create a new release @@ -44,4 +45,4 @@ jobs: name: Start all pull request CI jobs needs: - create-release - uses: Moderlab-Production/BlenderObjectType/.github/workflows/pr_main.yml@develop \ No newline at end of file + uses: Moderlab-Production/BlenderTemplate/.github/workflows/pr_main.yml@main \ No newline at end of file diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8a49019..3003abf 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -21,8 +21,8 @@ on: default: 'false' env: - APP_NAME: 'moderlab_addon' - NAME_PACKAGE: 'moderlab_addon.zip' + APP_NAME: 'moderlab_type' + NAME_PACKAGE: 'moderlab_type.zip' PATH_RELEASE: ${{ github.workspace }}\releases @@ -36,9 +36,7 @@ jobs: # Update the bl info version, update the init file and push if needed - name: Change version number in the bl info addon data - run: | - echo 'Debug this data : "${{ inputs.draft_version }}"' - python '.github/version.py' --tag=${{ inputs.num_version }} --name=${{ env.APP_NAME }} + run: python '.github/version.py' --tag=${{ inputs.num_version }} --name=${{ env.APP_NAME }} - name: Commit the previous update uses: actions-js/push@v1.3 diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml index 0c3238a..4bc179e 100644 --- a/.github/workflows/pr_main.yml +++ b/.github/workflows/pr_main.yml @@ -37,7 +37,7 @@ jobs: id: get_semantic_setup uses: oprypin/find-latest-tag@v1.1.0 with: - repository: Moderlab-Production/BlenderTemplate + repository: ${{ github.repository }} releases-only: true prefix: 'v' token: ${{ secrets.GITHUB_TOKEN }} @@ -55,12 +55,12 @@ jobs: fi unit-test: - uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@develop + uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@main release-package: needs: - init-release-data - uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@develop + uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@main with: num_version: ${{ needs.init-release-data.outputs.version_number }} name_version: ${{ needs.init-release-data.outputs.version_name }}