Skip to content

Commit 069d9d7

Browse files
committed
feat(tooling): Set version number in webpack build path
1 parent 8a55b4b commit 069d9d7

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

Jenkinsfile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,38 @@ ansiColor('xterm') {
8484

8585
stage('Test') {
8686
withCredentials([
87-
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'COMMON_IDENTITY_CLIENT_SECRET'),
87+
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'CISCOSPARK_CLIENT_SECRET'),
8888
usernamePassword(credentialsId: 'SAUCE_LABS_VALIDATED_MERGE_CREDENTIALS', passwordVariable: 'SAUCE_ACCESS_KEY', usernameVariable: 'SAUCE_USERNAME'),
8989
]) {
9090
sh '''#!/bin/bash -ex
9191
source ~/.nvm/nvm.sh
9292
nvm use v6
9393
NODE_ENV=test npm run build:bundle && npm run build:package widget-message-meet
94-
COMMON_IDENTITY_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true npm test
94+
CISCOSPARK_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true npm test
9595
'''
9696
}
9797
}
9898

99+
stage('Bump version'){
100+
sh '''#!/bin/bash -ex
101+
source ~/.nvm/nvm.sh
102+
nvm use v6
103+
npm version patch
104+
version=`grep "version" package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[", ]//g'`
105+
echo \$version > .version
106+
git add package.json
107+
git commit -m "build $packageJsonVerson"
108+
git tag -a "v\$version" -m "`git log -1 --format=%s`"
109+
'''
110+
packageJsonVersion = readFile '.version'
111+
}
112+
99113
stage('Build'){
100114
withCredentials([usernamePassword(credentialsId: 'MESSAGE_DEMO_CLIENT', passwordVariable: 'MESSAGE_DEMO_CLIENT_SECRET', usernameVariable: 'MESSAGE_DEMO_CLIENT_ID')]) {
101-
sh '''#!/bin/bash -ex
102-
source ~/.nvm/nvm.sh
103-
nvm use v6
104-
npm run build:bundle && npm run build:package widget-message-meet
105-
'''
115+
sh 'source ~/.nvm/nvm.sh'
116+
sh 'nvm use v6'
117+
sh "BUILD_PUBLIC_PATH=\"https://code.s4d.io/widget-message-meet/${packageJsonVersion}/demo/\" npm run build:bundle"
118+
sh "BUILD_PUBLIC_PATH=\"https://code.s4d.io/widget-message-meet/${packageJsonVersion}\" npm run build:package widget-message-meet"
106119
}
107120
}
108121

@@ -122,19 +135,6 @@ ansiColor('xterm') {
122135
}
123136

124137
if (currentBuild.result == 'SUCCESS'){
125-
stage('Bump version'){
126-
sh '''#!/bin/bash -ex
127-
source ~/.nvm/nvm.sh
128-
nvm use v6
129-
npm version patch
130-
version=`grep "version" package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[", ]//g'`
131-
echo $version > .version
132-
git add package.json
133-
git commit -m "build $packageJsonVerson"
134-
git tag -a "v$version" -m "`git log -1 --format=%s`"
135-
'''
136-
packageJsonVersion = readFile '.version'
137-
}
138138

139139
archive 'packages/node_modules/@ciscospark/widget-message-meet/dist/**/*'
140140
archive 'dist/**/*'

scripts/webpack/webpack.prod.babel.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ if (fs.existsSync(`./src/index.html`)) {
3939
);
4040
}
4141

42+
const publicPath = process.env.BUILD_PUBLIC_PATH;
43+
4244
export default webpackBaseConfig({
4345
entry: `./index.js`,
4446
output: {
4547
filename: `bundle.js`,
4648
path: path.resolve(process.cwd(), `dist`),
47-
sourceMapFilename: `[file].map`
49+
sourceMapFilename: `[file].map`,
50+
publicPath
4851
},
4952
// Full source maps for production debugging
5053
devtool: `source-map`,

0 commit comments

Comments
 (0)