Forgotten Bump (#108)

* Forgotten Bump

* Changing Workflow Job

* 🔧 Fix automation due to label changes

Signed-off-by: Luke Tainton <luke@tainton.uk>

Co-authored-by: Luke Tainton <luke@tainton.uk>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: '🐛'
-labels: type/bug
+labels: type:bug
 assignees:
 
 ---

.github/ISSUE_TEMPLATE/document_issue.md

@@ -2,7 +2,7 @@
 name: Document request
 about: Request a change to documentation
 title: '📚'
-labels: type/docs
+labels: type:docs
 assignees:
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: '✨'
-labels: type/feature
+labels: type:feature
 assignees:
 
 ---

.github/issue-branch.yml

@@ -2,14 +2,14 @@ mode: auto
 silent: false
 branchName: '${issue.number}'
 branches:
-  - label: type/feature
+  - label: type:feature
-    prefix: feat/
+    prefix: feat-
-  - label: type/bug
+  - label: type:bug
-    prefix: bug/
+    prefix: bug-
-  - label: type/epic
+  - label: type:epic
-    prefix: epic/
+    prefix: epic-
-  - label: type/docs
+  - label: type:docs
-    prefix: docs/
+    prefix: docs-
-  - label: type/automation
+  - label: type:automation
-    prefix: auto/
+    prefix: auto-
 autoCloseIssue: true

.github/workflows/autobranch.yml

@@ -3,8 +3,6 @@ name: Auto-create branches
 on:
     issues:
         types: [assigned]
-    issue_comment:
-        types: [created]
 
 jobs:
     create_issue_branch_job:

.github/workflows/deploy.yml

@@ -4,28 +4,26 @@ on:
     branches: main
 
 jobs:
-  bump-version:
+  release-on-push:
-    name: Bump version number
     runs-on: ubuntu-latest
     outputs: 
-      ver: ${{ steps.ver.outputs.version }}
+      ver: ${{ steps.release.outputs.version }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - id: bump
+      - id: release
-      uses: zwaldowski/match-label-action@v1
+        uses: rymndhng/release-on-push-action@master
-      with:
+        with:
-        allowed: >
+          bump_version_scheme: minor
-          major
+          
-          minor
+      - name: Check Output Parameters
-          patch
+        run: |
-    - id: ver
+          echo "Got tag name ${{ steps.release.outputs.tag_name }}"
-      uses: zwaldowski/semver-release-action@v1
+          echo "Got release version ${{ steps.release.outputs.version }}"
-      with:
-        bump: ${{ steps.bump.outputs.match }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
 
   docker-dh:
     name: Push to Docker Hub
-    needs: [bump-version]
+    needs: [release-on-push]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -33,18 +31,18 @@ jobs:
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
     - name: Build image for Docker Hub
       env:
-        VERSION: ${{ needs.bump-version.output.ver }}
+        VERSION: ${{ needs.release-on-push.output.ver }}
       run: docker build . --file Dockerfile --tag luketainton/fhed:$VERSION luketainton/fhed:latest
     - name: Push image to Docker Hub
       env:
-        VERSION: ${{ needs.bump-version.output.ver }}
+        VERSION: ${{ needs.release-on-push.output.ver }}
       run: |
         docker push luketainton/fhed:$VERSION &&
         docker push luketainton/fhed:latest
       
   docker-ghr:
     name: Push to GitHub Package Registry
-    needs: [bump-version]
+    needs: [release-on-push]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -52,11 +50,11 @@ jobs:
       run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
     - name: Build image for GitHub Package Registry
       env:
-        VERSION: ${{ needs.bump-version.output.ver }}
+        VERSION: ${{ needs.release-on-push.output.ver }}
       run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest docker.pkg.github.com/luketainton/fhed/fhed:$VERSION
     - name: Push image to GitHub Package Registry
       env:
-        VERSION: ${{ needs.bump-version.output.ver }}
+        VERSION: ${{ needs.release-on-push.output.ver }}
       run: |
         docker push docker.pkg.github.com/luketainton/fhed/fhed:$VERSION &&
         docker push docker.pkg.github.com/luketainton/fhed/fhed:latest

.github/workflows/stale.yml

@@ -15,5 +15,5 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'
         stale-pr-message: 'This pull request has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'
-        stale-issue-label: 'status/stale'
+        stale-issue-label: 'status:stale'
-        stale-pr-label: 'status/stale'
+        stale-pr-label: 'status:stale'