1.0.0 - Fixed workflow in making latest release (#3)

* Fixed workflow in making latest release * Added PR CI Finished Job * Added text colour widget version --------- Co-authored-by: ponlawat-w <[email protected]>
ponlawat-w · Nov 3, 2023 · 91478d6 · 91478d6
1 parent fc59a67
commit 91478d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -41,3 +41,10 @@ jobs:
       widget-backgroundcolour-branch: ${{ needs.widget-versions.outputs.widget-backgroundcolour-branch }}
       widget-fontface-branch: ${{ needs.widget-versions.outputs.widget-fontface-branch }}
       widget-fontsize-branch: ${{ needs.widget-versions.outputs.widget-fontsize-branch }}
+      widget-textcolour-branch: ${{ needs.widget-versions.outputs.widget-textcolour-branch }}
+  pr-ci-finished:
+    name: PR CI Finished
+    needs: ci
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
       release: ${{ steps.plugin-info.outputs.PLUGIN_RELEASE }}
       version: ${{ steps.plugin-info.outputs.PLUGIN_VERSION }}
       branch-no-widgets: ${{ steps.get-branch.outputs.BRANCH_NAME }}
-      branch-with-widgets: ${{ steps.get-branch.outputs.BRANCH_NAME }}-default-widgets
+      branch-with-widgets: ${{ steps.get-branch.outputs.BRANCH_NAME }}-with-widgets
 
     runs-on: ubuntu-latest
     steps:
@@ -87,7 +87,7 @@ jobs:
         run: |
           git config --global user.name "ponlawat-w"
           git config --global user.email "[email protected]"
-          git checkout -b ${{ steps.get-branch.outputs.BRANCH_NAME }}-default-widgets
+          git checkout -b ${{ steps.get-branch.outputs.BRANCH_NAME }}-with-widgets
           rm ./.gitignore
           git add -A
           git commit -m 'Removed .gitignore'
@@ -129,7 +129,7 @@ jobs:
           rm -rf widgets/textcolour/.github
           git add -A
           git commit -m 'Added default widgets'
-          git push -f -u origin ${{ steps.get-branch.outputs.BRANCH_NAME }}-default-widgets
+          git push -f -u origin ${{ steps.get-branch.outputs.BRANCH_NAME }}-with-widgets
 
   release:
 
@@ -180,6 +180,6 @@ jobs:
 
       - name: Make latest version
         if: ${{ matrix.latest }}
-        run: gh release edit --repo ponlawat-w/moodle-local_accessibility ${{ matrix.branch }} --latest
+        run: gh release edit --repo ponlawat-w/moodle-local_accessibility ${{ matrix.name }} --latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}