From 20bc72438052089e2f0dc9e554dd02b8281ec031 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:46 +0000 Subject: [PATCH 01/14] Bump groovy-all from 2.5.11 to 3.0.8 Bumps [groovy-all](https://github.com/apache/groovy) from 2.5.11 to 3.0.8. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ab939f5d7..dd9d44068 100644 --- a/build.gradle +++ b/build.gradle @@ -121,7 +121,7 @@ repositories { dependencies { // Use the latest Groovy version for building this library - compileOnly('org.codehaus.groovy:groovy-all:2.5.11') + compileOnly('org.codehaus.groovy:groovy-all:3.0.8') compileOnly('org.jenkins-ci.main:jenkins-core:2.85') compileOnly('com.cloudbees:groovy-cps:1.32') } From 9fbac400c5000f7952365c7c201c3a246c7054a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:46 +0000 Subject: [PATCH 02/14] Update actions/checkout requirement to v2.3.4 Updates the requirements on [actions/checkout](https://github.com/actions/checkout) to permit the latest version. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/commits/5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f) Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cc3102c0..0a5df8bbb 100644 --- a/.github/workflows/release.yml +++ b/.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 }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b83bb8eb..59f8a7e17 100644 --- a/.github/workflows/test.yml +++ b/.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 From 7aa99d23aef0d97869010f77c270d93a46b2b7dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:47 +0000 Subject: [PATCH 03/14] Bump io.github.gradle-nexus.publish-plugin from 1.0.0 to 1.1.0 Bumps io.github.gradle-nexus.publish-plugin from 1.0.0 to 1.1.0. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ab939f5d7..a2ef8e37a 100644 --- a/build.gradle +++ b/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' From bcced726391ba5279b8a4f2bb12f7821efa29e95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:47 +0000 Subject: [PATCH 04/14] Bump pytest from 6.2.2 to 6.2.4 in /tests Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.2 to 6.2.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.2...6.2.4) Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index e4d16ad41..962898650 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -15,7 +15,7 @@ pluggy==0.13.1 pre-commit==2.11.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 semver==2.13.0 From 990b8b42b3340e4d990eff34cd9a32d1fa1c9313 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:47 +0000 Subject: [PATCH 05/14] Bump release-drafter/release-drafter from v5.14.0 to v5.15.0 Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from v5.14.0 to v5.15.0. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.14.0...fe52e97d262833ae07d05efaf1a239df3f1b5cd4) Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cc3102c0..635df1aec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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}} From c752c485795f9055b29767cb3c915323162e677f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:52 +0000 Subject: [PATCH 06/14] Bump nodeenv from 1.5.0 to 1.6.0 in /tests Bumps [nodeenv](https://github.com/ekalinin/nodeenv) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/ekalinin/nodeenv/releases) - [Changelog](https://github.com/ekalinin/nodeenv/blob/master/CHANGES) - [Commits](https://github.com/ekalinin/nodeenv/compare/1.5.0...1.6.0) Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index e4d16ad41..94b151355 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -9,7 +9,7 @@ filelock==3.0.12 identify==2.1.2 idna==2.10 iniconfig==1.1.1 -nodeenv==1.5.0 +nodeenv==1.6.0 packaging==20.9 pluggy==0.13.1 pre-commit==2.11.1 From a460f7d68a259cc697ad44f4c978c13245bb532b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 07:51:58 +0000 Subject: [PATCH 07/14] Bump docker from 4.4.4 to 5.0.0 in /tests Bumps [docker](https://github.com/docker/docker-py) from 4.4.4 to 5.0.0. - [Release notes](https://github.com/docker/docker-py/releases) - [Commits](https://github.com/docker/docker-py/compare/4.4.4...5.0.0) Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index e4d16ad41..cdd1b732f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -4,7 +4,7 @@ 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 From c3a2f6a19b4d1db01f2c9d07a683510f259248bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 17:54:08 +0000 Subject: [PATCH 08/14] Bump jenkins-core from 2.85 to 2.291 Bumps [jenkins-core](https://github.com/jenkinsci/pom) from 2.85 to 2.291. - [Release notes](https://github.com/jenkinsci/pom/releases) - [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/pom/commits) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dd9d44068..af794c2f5 100644 --- a/build.gradle +++ b/build.gradle @@ -122,7 +122,7 @@ repositories { dependencies { // Use the latest Groovy version for building this library compileOnly('org.codehaus.groovy:groovy-all:3.0.8') - compileOnly('org.jenkins-ci.main:jenkins-core:2.85') + compileOnly('org.jenkins-ci.main:jenkins-core:2.291') compileOnly('com.cloudbees:groovy-cps:1.32') } From 30dcc4a7c9af27e8b96125856fbf27a34108441d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 18:21:30 +0000 Subject: [PATCH 09/14] Bump pre-commit from 2.11.1 to 2.12.1 in /tests Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.11.1 to 2.12.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.11.1...v2.12.1) Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index a43f3a093..6e0539087 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -12,7 +12,7 @@ iniconfig==1.1.1 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.4 From 2ffadf4d66cf244a42c54254aa13d99aae6087cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 18:21:48 +0000 Subject: [PATCH 10/14] Bump idna from 2.10 to 3.1 in /tests Bumps [idna](https://github.com/kjd/idna) from 2.10 to 3.1. - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst) - [Commits](https://github.com/kjd/idna/compare/v2.10...v3.1) Signed-off-by: dependabot[bot] --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index a43f3a093..738d03a09 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -7,7 +7,7 @@ distlib==0.3.1 docker==5.0.0 filelock==3.0.12 identify==2.1.2 -idna==2.10 +idna==3.1 iniconfig==1.1.1 nodeenv==1.6.0 packaging==20.9 From 38154c83099208f8ab1465ff15838da3ab9fc61f Mon Sep 17 00:00:00 2001 From: Levi Blaney Date: Sat, 8 May 2021 14:24:56 -0400 Subject: [PATCH 11/14] update version of requests --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 738d03a09..5b9a8ab4c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -17,7 +17,7 @@ py==1.10.0 pyparsing==2.4.7 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 From cab464fbdf164e70169e60c67209d645b116f21d Mon Sep 17 00:00:00 2001 From: Levi Blaney Date: Sat, 8 May 2021 14:44:26 -0400 Subject: [PATCH 12/14] disable reviews when checking PR labels --- .github/workflows/pr_label.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_label.yml b/.github/workflows/pr_label.yml index b4c9173b5..b3f124eed 100644 --- a/.github/workflows/pr_label.yml +++ b/.github/workflows/pr_label.yml @@ -15,6 +15,7 @@ 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/verify-pr-label-action@v1.4.0 @@ -22,3 +23,4 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} valid-labels: 'feature, enhancement, fix, bugfix, bug, chore' pull-request-number: ${{ github.event.pull_request.number }} + disable-reviews: true From 9b113ebab3cd4197d01c8b188b6acbbd43ac09d0 Mon Sep 17 00:00:00 2001 From: Levi Blaney Date: Sat, 8 May 2021 15:02:05 -0400 Subject: [PATCH 13/14] update release to not reqire tag --- .github/dependabot.yml | 7 +++++++ .github/workflows/pr_label.yml | 2 ++ tests/helpers/release.py | 13 +++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7a0c27f72..49215f913 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,3 +26,10 @@ updates: labels: - "chore" - "patch" +include-labels: + - 'feature' + - 'enhancement' + - 'fix' + - 'bugfix' + - 'bug' + - 'chore' diff --git a/.github/workflows/pr_label.yml b/.github/workflows/pr_label.yml index b3f124eed..fc4313c5b 100644 --- a/.github/workflows/pr_label.yml +++ b/.github/workflows/pr_label.yml @@ -2,6 +2,8 @@ name: PR on: pull_request_target: + branches: + - 'develop' types: [opened, labeled, unlabeled, synchronize] jobs: diff --git a/tests/helpers/release.py b/tests/helpers/release.py index ab4f94da4..6ff1ec62e 100644 --- a/tests/helpers/release.py +++ b/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) From 6cba6c33b8d29778e2a68dc0dd86d287e1201dbd Mon Sep 17 00:00:00 2001 From: Levi Blaney Date: Sat, 8 May 2021 15:14:38 -0400 Subject: [PATCH 14/14] move labels to correct config file --- .github/dependabot.yml | 7 ------- .github/release-drafter.yml | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 49215f913..7a0c27f72 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,10 +26,3 @@ updates: labels: - "chore" - "patch" -include-labels: - - 'feature' - - 'enhancement' - - 'fix' - - 'bugfix' - - 'bug' - - 'chore' diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 5ce2ada0f..c50afe634 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -18,3 +18,10 @@ template: | ## Changes $CHANGES +include-labels: + - 'feature' + - 'enhancement' + - 'fix' + - 'bugfix' + - 'bug' + - 'chore'