Update to support needed version handling for publication

cyberark · Aug 2, 2024 · 3debae4 · 3debae4
1 parent d60298f
commit 3debae4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,4 +1,5 @@
 # all available options: https://goreleaser.com/customization/
+version: 2
 project_name: terraform-provider-conjur
 
 before:
@@ -29,6 +30,7 @@ builds:
 
 archives:
   - id: conjur-terraform-release-archive
+    name_template: "{{ .ProjectName }}_{{ .Env.CONJUR_PLUGIN_VERSION }}_{{ .Os }}_{{ .Arch }}"
     format: zip
     files:
       - README.md
@@ -61,7 +63,7 @@ brews:
       # Running bin directly gives error, exit code 1
       system "#{bin}/terraform-provider-conjur_v{{.Env.CONJUR_PLUGIN_VERSION}}", "-h"
 
-    tap:
+    repository:
       owner: cyberark
       name: homebrew-tools
     skip_upload: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.6.8] - 2024-08-01
+### Changed
+  - Update to support new automated release process and correct terraform registry
+    publication.
 
 ## [0.6.7] - 2024-04-08
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -12,9 +12,10 @@ properties([
 
 // Performs release promotion.  No other stages will be run
 if (params.MODE == "PROMOTE") {
-  release.promote(params.VERSION_TO_PROMOTE) { sourceVersion, targetVersion, assetDirectory ->
-
+  release.promote(params.VERSION_TO_PROMOTE) { infrapool, sourceVersion, targetVersion, assetDirectory ->
+    // No actions needed, artifacts labeled correctly
   }
+
   // Copy Github Enterprise release to Github
   release.copyEnterpriseRelease(params.VERSION_TO_PROMOTE)
   return
@@ -54,6 +55,13 @@ pipeline {
       }
     }
 
+    // Generates a VERSION file based on the current build number and latest version in CHANGELOG.md
+    stage('Validate changelog and set version') {
+      steps {
+        updateVersion(INFRAPOOL_EXECUTORV2_AGENT_0, "CHANGELOG.md", "${BUILD_NUMBER}")
+      }
+    }
+
     stage('Get latest upstream dependencies') {
       steps {
         script {
@@ -65,13 +73,6 @@ pipeline {
       }
     }
 
-    // Generates a VERSION file based on the current build number and latest version in CHANGELOG.md
-    stage('Validate changelog and set version') {
-      steps {
-        updateVersion(INFRAPOOL_EXECUTORV2_AGENT_0, "CHANGELOG.md", "${BUILD_NUMBER}")
-      }
-    }
-
     stage('Build artifacts') {
       steps {
         script {