conjur-debify 2.1.0 → 2.1.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1513a687cde9e9f2079436b6c9b290748d22a66ebd890c957e4dd1e9200592
-  data.tar.gz: bdbc0f7c3ce085d8ac9ad012b51c07498efcd21218896eb73e6bd4ef12806391
+  metadata.gz: 8ef8a9cc4afa7d0d497eeb7cc8bc37f4a958019460f027c4144422f62b156afb
+  data.tar.gz: 969998395e00778d72f777e78343c1f7f4b0cd4b71404cc2fe185d6930bcdad0
 SHA512:
-  metadata.gz: 77413aeaa1c6e74e293522012375671357a265d25d7e9d70cae42df8218b265a12cdfe5612bcab58b569fc9cb07ba30a44ee595f962239322b4871849f8b3b69
-  data.tar.gz: dc986fbd9bb73204846c8a39ed791432c4d668ac9c1facb51863765e67c81d5ebe004152440ff67b963a5b69abb931924f984c980cd70208c83566d9c6fabcea
+  metadata.gz: 1fee2f382be527e02407da6096f1fef3e1dea8c5b443828eaa45ab2c76cd2e779addcf872bdced4567584ddfc43e311441931a32febe24d02b22806e404e9961
+  data.tar.gz: 5fef9c7c2bdd4e966278425f0f1009da8ce01b321d4b73bca16cd9853a2707ab7cf013fe5fd8dfad339eb7f1e96db445f9b53ef7c698746851338eef3c1453ff

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [Unreleased]
+## [2.1.1]
+### Changed
+
+- Update to use automated release process
 
 # 2.1.0
 ### Changed

data/Dockerfile

@@ -23,7 +23,7 @@ RUN gem install bundler:2.2.30
 RUN gem build debify.gemspec
 
 ARG VERSION
-RUN gem install -N conjur-debify-${VERSION}.gem
+RUN gem install -N conjur-debify-*.gem
 
 ARG CONJUR_APPLIANCE_URL
 ENV CONJUR_APPLIANCE_URL ${CONJUR_APPLIANCE_URL:-https://conjurops.itp.conjur.net}

data/Jenkinsfile

@@ -1,29 +1,52 @@
 #!/usr/bin/env groovy
 
+// Automated release, promotion and dependencies
+properties([
+  release.addParams(),
+  dependencies(['cyberark/conjur-base-image'])
+])
+
+if (params.MODE == "PROMOTE") {
+  release.promote(params.VERSION_TO_PROMOTE) { sourceVersion, targetVersion, assetDirectory ->
+    sh './publish-rubygems.sh'
+  }
+  return
+}
+
 pipeline {
   agent { label 'executor-v2' }
 
   options {
     timestamps()
     buildDiscarder(logRotator(daysToKeepStr: '30'))
-    skipDefaultCheckout()
   }
 
   triggers {
     cron(getDailyCronString())
   }
 
+  environment {
+    MODE = release.canonicalizeMode()
+  }
+
   stages {
-    stage('Checkout') {
+    stage ("Skip build if triggering job didn't create a release") {
+      when {
+        expression {
+          MODE == "SKIP"
+        }
+      }
       steps {
-        // One of our cukes tests to see if debify can correctly
-        // determine the version for the package being created, based
-        // on the tags in the repo. By default, the Git SCM plugin
-        // doesn't pull tags, causing the cuke to fail.
-        //
-        // I couldn't find any way to configure the plugin, so I used
-        // the Snippet Generator to create this:
-        checkout([$class: 'GitSCM', branches: [[name: env.BRANCH_NAME]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'conjur-jenkins', url: 'git@github.com:conjurinc/debify.git']]])
+        script {
+          currentBuild.result = 'ABORTED'
+          error("Aborting build because this build was triggered from upstream, but no release was built")
+        }
+      }
+    }
+    stage('Prepare') {
+      steps {
+        // Initialize VERSION file
+        updateVersion("CHANGELOG.md", "${BUILD_NUMBER}")
       }
     }
     stage('Build docker image') {
@@ -71,28 +94,16 @@ pipeline {
 
     stage('Publish to RubyGems') {
       when {
-        allOf {
-          branch 'master'
-          /* expression {
-            boolean publish = false
-
-            try {
-              timeout(time: 5, unit: 'MINUTES') {
-                input(message: 'Publish to RubyGems?')
-                publish = true
-              }
-            } catch (final ignore) {
-              publish = false
-            }
-
-            return publish
-          }*/
+        expression {
+          MODE == "RELEASE"
         }
       }
 
       steps {
-        checkout scm
-        sh './publish-rubygem.sh'
+        release {
+          sh './publish-rubygem.sh'
+          sh "cp debify-*.gem release-assets/."
+        }
       }
     }
   }

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1-2

data/debify.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/conjurinc/debify"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").append("VERSION")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/publish-rubygem.sh

@@ -1,11 +1,10 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
-docker pull registry.tld/conjurinc/publish-rubygem
-
-docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd
+docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd \
+  -e VERSION \
+  -e bom-assets/ \
+  -e release-assets/
 
 summon --yaml "RUBYGEMS_API_KEY: !var rubygems/api-key" \
-  docker run --rm --env-file @SUMMONENVFILE -v "$(pwd)":/opt/src \
-  registry.tld/conjurinc/publish-rubygem debify
-
-docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd
+  publish-rubygem debify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1.pre.2
 platform: ruby
 authors:
 - CyberArk Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -246,11 +246,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages