From 134d05c535e1d7ef0a526e1b0b70d7c2034152bd Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Fri, 4 Nov 2022 09:31:27 -0300 Subject: [PATCH 1/3] update gradle --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dcc6f8a..a8ad504 100644 --- a/build.gradle +++ b/build.gradle @@ -12,11 +12,11 @@ ext.pluginDescription = "Docker manager plugin" ext.sopsCopyright = "© 2022, Rundeck, Inc." ext.sopsUrl = "http://rundeck.com" ext.buildDateString=new Date().format("yyyy-MM-dd'T'HH:mm:ssX") -ext.archivesBaseName = "docker-container" +ext.archivesBaseName = "docker" ext.pluginBaseFolder = "." scmVersion { - ignoreUncommittedChanges = false + ignoreUncommittedChanges = true tag { prefix = '' versionSeparator = '' @@ -35,4 +35,4 @@ scmVersion { project.version = scmVersion.version ext.archiveFilename = ext.archivesBaseName + '-' + version -apply from: 'https://raw.githubusercontent.com/rundeck-plugins/build-zip/master/build.gradle' +apply from: 'https://raw.githubusercontent.com/rundeck-plugins/build-zip/gradle-5.6/build.gradle' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d2805..92f06b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From b3f7fd87f95d32390a321d3d51a0d5972640edea Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Fri, 4 Nov 2022 09:34:44 -0300 Subject: [PATCH 2/3] update axion --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a8ad504..aa28b47 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } } plugins { - id 'pl.allegro.tech.build.axion-release' version '1.11.0' + id 'pl.allegro.tech.build.axion-release' version '1.13.4' } ext.pluginName = 'Docker Plugin' From adca76509e2e3d632eeef96b7540affe7e2ecb26 Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Fri, 4 Nov 2022 09:36:42 -0300 Subject: [PATCH 3/3] fix artifact name --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98f1b21..5ad6eac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,10 @@ jobs: - name: Get Release Version id: get_version run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION - - name: Upload docker-container zip + - name: Upload docker zip uses: actions/upload-artifact@v1.0.0 with: # Artifact name - name: docker-container-${{ steps.get_version.outputs.VERSION }} + name: docker-${{ steps.get_version.outputs.VERSION }} # Directory containing files to upload - path: ./build/libs/docker-container-${{ steps.get_version.outputs.VERSION }}.zip \ No newline at end of file + path: ./build/libs/docker-${{ steps.get_version.outputs.VERSION }}.zip \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a01f978..741c28b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./build/libs/docker-container-${{ steps.get_version.outputs.VERSION }}.zip - asset_name: docker-container-${{ steps.get_version.outputs.VERSION }}.zip + asset_path: ./build/libs/docker-${{ steps.get_version.outputs.VERSION }}.zip + asset_name: docker-${{ steps.get_version.outputs.VERSION }}.zip asset_content_type: application/zip