Skip to content

Commit bf145e4

Browse files
Merge branch 'release' into 'master'
2 parents 010abf6 + 29b6385 commit bf145e4

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

GemfileTest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'faraday', '>= 1.4.1'
3+
gem 'faraday', '~> 1.9', '>= 1.9.3'
44
gem 'marcel', '>= 1.0.0'
55
gem 'multipart-parser', '~> 0.1.1'
66
gem 'aspose_words_cloud', '> 21.12'

Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def runtests(dockerImageVersion)
3838
if (needToBuild) {
3939
docker.image('ruby:' + dockerImageVersion).inside('-u root'){
4040
if (params.packageTesting) {
41-
sh "rm -rf lib"
4241
sh "mv GemfileTest Gemfile"
4342
}
4443
stage('build'){

JenkinsfileRelease

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
parameters {
22
string(name: 'version', defaultValue: '19.10.0', description: 'version of gem')
33
string(name: 'deployKey', defaultValue: 'xxx', description: 'key')
4-
string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')
5-
string(name: 'StartFromStage', defaultValue: '0', description: '0 based index of stage which will be started')
4+
string(name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')
5+
string(name: 'StartFromStage', defaultValue: '0', description: '0 based index of stage which will be started')
66
}
77
node('words-linux') {
88
try {
@@ -40,14 +40,15 @@ def testGemLocally()
4040
checkout([$class: 'GitSCM', branches: [[name: '*/testPackage']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
4141
withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
4242
sh 'mkdir -p Settings'
43-
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
43+
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
4444
}
4545
}
4646

4747
stage('3:build gem and test'){
48-
docker.image('ruby:2.4').inside('-u root'){
48+
docker.image('ruby:2.7').inside('-u root'){
4949
stage('upload to rubygems'){
5050
sh "gem build aspose_words_cloud.gemspec"
51+
sh "gem install nokogiri -v 1.10.10"
5152
sh "gem install ./aspose_words_cloud-${version}.gem"
5253
}
5354

@@ -79,7 +80,7 @@ def publishGem()
7980
}
8081

8182
stage('5:build gem publish'){
82-
docker.image('ruby:2.4').inside('-u root'){
83+
docker.image('ruby:2.7').inside('-u root'){
8384
stage('upload to rubygems'){
8485
sh "gem build aspose_words_cloud.gemspec"
8586
sh "mkdir ~/.gem"

lib/aspose_words_cloud/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
# ------------------------------------------------------------------------------------
2525

2626
module AsposeWordsCloud
27-
VERSION = "22.8".freeze
27+
VERSION = "22.8.0".freeze
2828
end

tests/base_test_context.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module AsposeWordsCloud
2727
require "minitest/autorun"
2828
require "minitest/unit"
2929
require 'securerandom'
30-
require_relative '../lib/aspose_words_cloud'
30+
require 'aspose_words_cloud'
3131
class BaseTestContext < Minitest::Test
3232
include MiniTest::Assertions
3333
def setup

0 commit comments

Comments
 (0)