Skip to content

Commit 1716eb2

Browse files
authored
Merge pull request #293 from purecloudlabs/build-fixes
build(iframe-coordinator-cli): fix failing build due to package-lock.json mismatch
2 parents 3f45509 + 5fb1599 commit 1716eb2

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

Jenkinsfile

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ import com.genesys.jenkins.Service
33

44
def notifications = null
55
String[] mailingList = [
6-
7-
6+
87
]
98

109
def isReleaseBranch() {
11-
return env.SHORT_BRANCH.equals('main') || env.SHORT_BRANCH.equals('master');
10+
return env.SHORT_BRANCH.equals('main') || env.SHORT_BRANCH.equals('master')
1211
}
1312

1413
pipeline {
@@ -19,9 +18,9 @@ pipeline {
1918
}
2019

2120
environment {
22-
NPM_UTIL_PATH = "npm-utils"
23-
REPO_DIR = "repo"
24-
SHORT_BRANCH = env.GIT_BRANCH.replaceFirst(/^origin\//, '');
21+
NPM_UTIL_PATH = 'npm-utils'
22+
REPO_DIR = 'repo'
23+
SHORT_BRANCH = env.GIT_BRANCH.replaceFirst(/^origin\//, '')
2524
NPM_TOKEN = credentials('2844c47b-19b8-4c5f-b901-190de49c0883')
2625
ARTIFACTORY = credentials('14645c89-70a0-4b46-a8a2-2f0a580d13dd')
2726
}
@@ -78,26 +77,26 @@ pipeline {
7877
dir(env.REPO_DIR) {
7978
// Create an npmrc file, just so we can install deps cleanly from artifactory
8079
sh "${env.WORKSPACE}/${env.NPM_UTIL_PATH}/scripts/jenkins-create-npmrc.sh"
81-
sh "npm ci"
80+
sh 'npm ci'
8281
}
8382
}
8483
}
8584

8685
stage('Check') {
8786
steps {
8887
dir(env.REPO_DIR) {
89-
sh "npm run lint"
90-
sh "npm run test"
88+
sh 'npm run lint'
89+
sh 'npm run test'
9190
}
9291
}
9392
}
9493

9594
stage('Build') {
9695
steps {
9796
dir(env.REPO_DIR) {
98-
sh "npm run release"
99-
sh "npm run sync-versions"
100-
sh "npm run build"
97+
sh 'npm run release'
98+
sh 'npm run sync-versions'
99+
sh 'npm run build'
101100
}
102101
}
103102
}
@@ -112,7 +111,7 @@ pipeline {
112111
echo "registry=https://registry.npmjs.org" >> ./.npmrc
113112
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ./.npmrc
114113
'''
115-
sh "npm run publish.iframe-coordinator"
114+
sh 'npm run publish.iframe-coordinator'
116115
sh('''
117116
RELEASE_VERSION="$(npm run --silent current-version --workspace=iframe-coordinator)"
118117
npm install --no-progress -P -E iframe-coordinator@$RELEASE_VERSION --workspace=iframe-coordinator-cli
@@ -121,19 +120,19 @@ pipeline {
121120
git commit --amend --no-edit --no-verify
122121
git tag -fa v$RELEASE_VERSION -m "chore(release): $RELEASE_VERSION"
123122
''')
124-
sh "npm run publish.iframe-coordinator-cli"
125-
sshagent (credentials: ['3aa16916-868b-4290-a9ee-b1a05343667e']) {
123+
sh 'npm run publish.iframe-coordinator-cli'
124+
sshagent(credentials: ['3aa16916-868b-4290-a9ee-b1a05343667e']) {
126125
sh "git push --follow-tags -u origin ${env.SHORT_BRANCH}"
127126
}
128-
}
127+
}
129128
}
130129
}
131130

132131
stage('Build Docs') {
133132
steps {
134-
dir (env.REPO_DIR) {
135-
sh "npm run doc"
136-
sh "./scripts/generate-deploy-files"
133+
dir(env.REPO_DIR) {
134+
sh 'npm run doc'
135+
sh './scripts/generate-deploy-files'
137136
sh '''
138137
export CDN_ROOT=$(npx --package=@purecloud/web-app-deploy@8 -- cached-asset-prefix --ecosystem pc --manifest dist/docs/manifest.json)
139138
./scripts/prepare-docs
@@ -147,7 +146,7 @@ pipeline {
147146
expression { isReleaseBranch() }
148147
}
149148
steps {
150-
dir (env.REPO_DIR) {
149+
dir(env.REPO_DIR) {
151150
sh '''
152151
npx --package=@purecloud/web-app-deploy@8 -- upload \
153152
--ecosystem pc \
@@ -163,7 +162,7 @@ pipeline {
163162
expression { isReleaseBranch() }
164163
}
165164
steps {
166-
dir (env.REPO_DIR) {
165+
dir(env.REPO_DIR) {
167166
sh '''
168167
npx --package=@purecloud/web-app-deploy@8 -- deploy \
169168
--ecosystem pc \
@@ -178,13 +177,13 @@ pipeline {
178177
post {
179178
fixed {
180179
script {
181-
notifications.emailResults(mailingList.join(" "))
180+
notifications.emailResults(mailingList.join(' '))
182181
}
183182
}
184183

185184
failure {
186185
script {
187-
notifications.emailResults(mailingList.join(" "))
186+
notifications.emailResults(mailingList.join(' '))
188187
}
189188
}
190189
}

package-lock.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/iframe-coordinator-cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"express": "^4.21.1",
1111
"find-root": "^1.1.0",
1212
"http-proxy-middleware": "^3.0.3",
13-
"iframe-coordinator": "6.2.0",
1413
"vue": "^2.7.16",
1514
"vue-class-component": "^7.2.6",
1615
"vue-notification": "^1.3.20",

0 commit comments

Comments
 (0)