From c2f7995d728b9a16e8a999ffdaf39712496caedb Mon Sep 17 00:00:00 2001
From: Aurelien Vaillant <aurelienvlt@free.fr>
Date: Wed, 26 Jan 2022 10:50:28 +0100
Subject: [PATCH 1/5] Package : Add info if the CI needed to make a commit and
 push it PR Main : Add workflow call input data

---
 .github/workflows/package.yml                 | 21 +++++++++++++++----
 .../{pull_request_main.yml => pr_main.yml}    |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)
 rename .github/workflows/{pull_request_main.yml => pr_main.yml} (97%)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index fc8b985..4189cfe 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -14,6 +14,11 @@ on:
         type: string
         required: true
         default: 'v0.0.0'
+      draft_version:
+        description: 'Info about the release, publish or a draft'
+        type: string
+        required: true
+        default: "false"
 
 env:
   APP_NAME: 'moderlab_type'
@@ -29,11 +34,19 @@ jobs:
     steps:
       - uses: actions/checkout@main
 
-      # Update the bl info version
+      # 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 set this tag "${{ steps.release.outputs.tag_name }}"
-          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
+        if: ${{ inputs.draft_version }}
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          author_name: Moderlab
+          author_email: a.vaillant.moderlab@gmail.com
+          message: '[Bot] Bump to ${{ inputs.num_version }} version.'
+          force: true
 
       # Make an archive with the plugin source only
       - name: Create zip archive release
diff --git a/.github/workflows/pull_request_main.yml b/.github/workflows/pr_main.yml
similarity index 97%
rename from .github/workflows/pull_request_main.yml
rename to .github/workflows/pr_main.yml
index 707c64b..c0a12ff 100644
--- a/.github/workflows/pull_request_main.yml
+++ b/.github/workflows/pr_main.yml
@@ -63,6 +63,7 @@ jobs:
     with:
       num_version: ${{ needs.init-release-data.outputs.version_number }}
       name_version: ${{ needs.init-release-data.outputs.version_name }}
+      draft_version: ${{ needs.init-release-data.outputs.version_draft }}
 
   publish-release:
     name: Publish the Github Release

From aa5ba2d3a2b1934c0e8ef4f7fc1db02f8af3897c Mon Sep 17 00:00:00 2001
From: Aurelien Vaillant <aurelienvlt@free.fr>
Date: Wed, 26 Jan 2022 11:51:42 +0100
Subject: [PATCH 2/5] Fix package setup

---
 .github/workflows/package.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 4189cfe..daf1044 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -18,7 +18,7 @@ on:
         description: 'Info about the release, publish or a draft'
         type: string
         required: true
-        default: "false"
+        default: 'false'
 
 env:
   APP_NAME: 'moderlab_type'
@@ -36,16 +36,19 @@ 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: python '.github/version.py' --tag=${{ inputs.num_version }} --name=${{ env.APP_NAME }}
+        run: |
+          echo 'Debug this data : "${{ inputs.draft_version }}"'
+          python '.github/version.py' --tag=${{ inputs.num_version }} --name=${{ env.APP_NAME }}
 
       - name: Commit the previous update
         uses: actions-js/push@v1.3
-        if: ${{ inputs.draft_version }}
+        if: ${{ inputs.draft_version == false }}
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           author_name: Moderlab
           author_email: a.vaillant.moderlab@gmail.com
           message: '[Bot] Bump to ${{ inputs.num_version }} version.'
+          branch: develop
           force: true
 
       # Make an archive with the plugin source only

From 42eb8756213b74e69671b351f2b3e364883a6a9a Mon Sep 17 00:00:00 2001
From: Aurelien Vaillant <aurelienvlt@free.fr>
Date: Wed, 26 Jan 2022 16:29:36 +0100
Subject: [PATCH 3/5] Fix path repo

---
 .github/workflows/feature.yml | 4 ++--
 .github/workflows/package.yml | 4 ++--
 .github/workflows/pr_main.yml | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index dd3e2de..c1bfd4e 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -7,10 +7,10 @@ on:
 
 jobs:
   unit-test:
-    uses: Moderlab-Production/BlenderObjectType/.github/workflows/unit_test.yml@develop
+    uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@develop
 
   generate-package:
-    uses: Moderlab-Production/BlenderObjectType/.github/workflows/package.yml@develop
+    uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@develop
     with:
       num_version: '0.0.0'
       name_version: 'v0.0.0'
\ No newline at end of file
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index daf1044..caf52d2 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -21,8 +21,8 @@ on:
         default: 'false'
 
 env:
-  APP_NAME: 'moderlab_type'
-  NAME_PACKAGE: 'moderlab_type.zip'
+  APP_NAME: 'moderlab_addon'
+  NAME_PACKAGE: 'moderlab_addon.zip'
   PATH_RELEASE: ${{ github.workspace }}\releases
 
 
diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml
index c0a12ff..3b78127 100644
--- a/.github/workflows/pr_main.yml
+++ b/.github/workflows/pr_main.yml
@@ -36,7 +36,7 @@ jobs:
         id: get_semantic_setup
         uses: oprypin/find-latest-tag@v1.1.0
         with:
-          repository: Moderlab-Production/BlenderObjectType
+          repository: Moderlab-Production/BlenderTemplate
           releases-only: true
           prefix: 'v'
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -54,12 +54,12 @@ jobs:
           fi
 
   unit-test:
-    uses: Moderlab-Production/BlenderObjectType/.github/workflows/unit_test.yml@develop
+    uses: Moderlab-Production/BlenderTemplate/.github/workflows/unit_test.yml@develop
 
   release-package:
     needs:
       - init-release-data
-    uses: Moderlab-Production/BlenderObjectType/.github/workflows/package.yml@develop
+    uses: Moderlab-Production/BlenderTemplate/.github/workflows/package.yml@develop
     with:
       num_version: ${{ needs.init-release-data.outputs.version_number }}
       name_version: ${{ needs.init-release-data.outputs.version_name }}

From 36f9c92aefc2614a9e81b9567e81964331f9c989 Mon Sep 17 00:00:00 2001
From: Aurelien Vaillant <aurelienvlt@free.fr>
Date: Fri, 28 Jan 2022 18:12:02 +0100
Subject: [PATCH 4/5] Small fixe with the default CI

---
 .github/workflows/init_release.yml | 8 +++++++-
 .github/workflows/package.yml      | 4 ++--
 .github/workflows/pr_main.yml      | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/init_release.yml b/.github/workflows/init_release.yml
index 6b6791c..f9a9023 100644
--- a/.github/workflows/init_release.yml
+++ b/.github/workflows/init_release.yml
@@ -38,4 +38,10 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           prerelease: true
-          tag: 'v${{ steps.semantic_setup.outputs.version }}'
\ No newline at end of file
+          tag: 'v${{ steps.semantic_setup.outputs.version }}'
+
+  pull-request-ci:
+    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
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index caf52d2..8a49019 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -54,8 +54,8 @@ jobs:
       # Make an archive with the plugin source only
       - name: Create zip archive release
         run: |
-          cd '${{ github.workspace }}/${{ env.APP_NAME }}'
-          zip -r '${{ github.workspace }}/releases/${{ env.NAME_PACKAGE }}' *
+          cd '${{ github.workspace }}'
+          zip -r '${{ github.workspace }}/releases/${{ env.NAME_PACKAGE }}' ${{ env.APP_NAME }}
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml
index 3b78127..0c3238a 100644
--- a/.github/workflows/pr_main.yml
+++ b/.github/workflows/pr_main.yml
@@ -1,6 +1,7 @@
 name: Create addon release
 
 on:
+  workflow_call:
   pull_request:
     branches:
       [main]

From 378583e958f09ded09a3532cfdc1d6d161966e07 Mon Sep 17 00:00:00 2001
From: Aurelien Vaillant <aurelienvlt@free.fr>
Date: Mon, 31 Jan 2022 11:23:50 +0100
Subject: [PATCH 5/5] 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 }}