Merge pull request #50 from DontShaveTheYak/develop

Release 0.6.3

.github/release-drafter.yml

@@ -18,3 +18,10 @@ template: |
   ## Changes
 
   $CHANGES
+include-labels:
+  - 'feature'
+  - 'enhancement'
+  - 'fix'
+  - 'bugfix'
+  - 'bug'
+  - 'chore'

.github/workflows/pr_label.yml

@@ -2,6 +2,8 @@ name: PR
 
 on:
   pull_request_target:
+    branches:
+        - 'develop'
     types: [opened, labeled, unlabeled, synchronize]
 
 jobs:
@@ -15,10 +17,12 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           valid-labels: 'major, minor, patch'
           pull-request-number: ${{ github.event.pull_request.number }}
+          disable-reviews: true
 
       - name: Had change type label
         uses: jesusvasquez333/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           valid-labels: 'feature, enhancement, fix, bugfix, bug, chore'
           pull-request-number: ${{ github.event.pull_request.number }}
+          disable-reviews: true

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
 
       - name: Checkout Code
-        uses: actions/checkout@v2.2.0
+        uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
 
@@ -51,7 +51,7 @@ jobs:
     needs: tag
     steps:
       - name: Checkout Code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
         with:
           ref: ${{ github.base_ref }}
 
@@ -72,7 +72,7 @@ jobs:
     needs: [tag, publish]
     steps:
       - name: Create Draft Release
-        uses: release-drafter/release-drafter@v5.14.0
+        uses: release-drafter/release-drafter@v5.15.0
         if: github.base_ref == 'develop'
         with:
           tag: ${{needs.tag.outputs.tag}}
@@ -81,7 +81,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Release
-        uses: release-drafter/release-drafter@v5.14.0
+        uses: release-drafter/release-drafter@v5.15.0
         if: github.base_ref == 'master'
         with:
           tag: ${{needs.tag.outputs.tag}}

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Set up Python
         uses: actions/setup-python@v2

build.gradle

@@ -18,7 +18,7 @@ plugins {
     // Needed for signing artifacts pushed to https://oss.sonatype.org/
     id 'signing'
 
-    id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 }
 
 version = project.findProperty('CICD_TAG') ?: '0.0.0-DEV'
@@ -121,8 +121,8 @@ repositories {
 
 dependencies {
     // Use the latest Groovy version for building this library
-    compileOnly('org.codehaus.groovy:groovy-all:2.5.11')
-    compileOnly('org.jenkins-ci.main:jenkins-core:2.85')
+    compileOnly('org.codehaus.groovy:groovy-all:3.0.8')
+    compileOnly('org.jenkins-ci.main:jenkins-core:2.291')
     compileOnly('com.cloudbees:groovy-cps:1.32')
 }
 

tests/helpers/release.py

@@ -35,15 +35,15 @@ def set_output(name: str, value: str):
 pull_request = sys.argv[2]
 branch = sys.argv[3]
 
-action_name = get_action(pull_request)
-
 action_methods = {
     'patch': 'bump_patch',
     'minor': 'bump_minor',
     'major': 'bump_major'
 }
 
-action = action_methods[action_name]
+if branch != "master":
+    action_name = get_action(pull_request)
+    action = action_methods[action_name]
 
 next_version: str = ''
 
@@ -55,9 +55,10 @@ def set_output(name: str, value: str):
 print(f'Latest release is {release_tag}')
 
 if branch == 'master':
-    version = semver.VersionInfo.parse(release_tag)
-    next_version = do_action(action, version)
-    set_output('next_tag', next_version)
+    print("This release is a final release!")
+    base_tag = latest_tag.split("-")[0]
+    bump_rule = "None"
+    set_output('next_tag', base_tag)
     sys.exit(0)
 
 

tests/requirements.txt

@@ -4,20 +4,20 @@ certifi==2020.12.5
 cfgv==3.2.0
 chardet==4.0.0
 distlib==0.3.1
-docker==4.4.4
+docker==5.0.0
 filelock==3.0.12
 identify==2.1.2
-idna==2.10
+idna==3.1
 iniconfig==1.1.1
-nodeenv==1.5.0
+nodeenv==1.6.0
 packaging==20.9
 pluggy==0.13.1
-pre-commit==2.11.1
+pre-commit==2.12.1
 py==1.10.0
 pyparsing==2.4.7
-pytest==6.2.2
+pytest==6.2.4
 PyYAML==5.4.1
-requests==2.25.1
+requests==2.15.1
 semver==2.13.0
 six==1.15.0
 toml==0.10.2