tweaks
diff --git a/Jenkinsfile b/Jenkinsfile
index 4132dd9..00f293f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,18 +1,28 @@
pipeline {
- agent { docker { image 'node:14-alpine' } }
-// agent any
-// aries-site-pub-PAT
+// agent { docker { image 'node:14-alpine' } }
+ agent any
+
stages {
stage('build') {
+ environment {
+ ARIES_SITE_CREDS = credentials('aries-site-pub-PAT')
+ }
steps {
- sh 'npm --version'
- sh 'chmod u+x build-publish.sh'
- sh 'pwd'
- sh 'ls -l'
-// sh 'sh build-publish.sh'
- withCredentials([usernamePassword(credentialsId: 'aries-site-pub-PAT', passwordVariable: 'password', usernameVariable: 'user')]) {
- sh 'sh build-publish.sh'
+ sh 'rm -rf build'
+// clone the aries-site-pub repo
+ sh 'git clone --depth 1 https://github.com/apache/aries-site-pub.git build/site'
+ dir('build/site') {
+ sh 'git rm -r .'
}
+
+ sh 'npm run plain-install'
+ sh 'npm run build-noclean'
+
+ dir('build/site') {
+ sh 'git add .'
+ sh 'echo `git commit -m "site build"`'
+ sh 'git push https://$ARIES_SITE_CREDS_USR:$ARIES_SITE_CREDS_PSW@github.com/apache/aries-site-pub.git master'
+ }
}
}
}
diff --git a/build-publish.sh b/build-publish.sh
index 851ba1d..be0adfe 100644
--- a/build-publish.sh
+++ b/build-publish.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Not currently used, but may be useful for local builds.
SITE_REPO=github.com/apache/aries-site-pub.git
@@ -16,10 +17,3 @@
)
npm run build-noclean
-
-(
-cd build/site
-git add .
-echo `git commit -m "site build"`
-git push https://${user}:${password}$SITE_REPO master
-)
