You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by se...@apache.org on 2023/04/02 22:20:01 UTC
[comdev-events-site] branch preview/test updated (aa42054 -> 8e1c4f6)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch preview/test
in repository https://gitbox.apache.org/repos/asf/comdev-events-site.git
from aa42054 Set up staging build
add 14532dd Obsolete files
add d1f3ba0 Don't track lock file
add 0dbee88 No longer needed
add 2b34154 No longer needed
add 5f825f5 No longer needed
new ab2b6fe Merge branch 'obsolete' into preview/test
add a4fea4c Add pagefind
new 8e1c4f6 Merge branch 'pagefind' into preview/test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 24 +-
layouts/barcamp-bos/baseof.html | 166 -
layouts/barcamp-bos/list.html | 3 -
layouts/barcamp-bos/single.html | 3 -
layouts/barcamp-dc/baseof.html | 174 -
layouts/barcamp-dc/list.html | 3 -
layouts/barcamp-dc/single.html | 3 -
source/_index.md | 9 +
source/event/2012/barcamp-dc/__index.md | 16 -
source/event/2012/barcamp-dc/news.md | 11 -
source/event/2012/barcamp-dc/privacy.md | 24 -
source/event/2012/barcamp-dc/registration.md | 25 -
source/event/2012/barcamp-dc/sponsors.md | 48 -
source/event/2012/barcamp-dc/venue.md | 20 -
source/event/2012/barcamp-lk/__index.md | 10 -
source/event/2013/barcamp-bos/__index.md | 18 -
source/event/2013/barcamp-bos/news.md | 13 -
source/event/2013/barcamp-bos/privacy.md | 20 -
source/event/2013/barcamp-bos/registration.md | 12 -
source/event/2013/barcamp-bos/sponsors.md | 22 -
source/event/2013/barcamp-bos/venue.md | 18 -
static/event/2012/barcamp-dc/alfresco.png | Bin 24579 -> 0 bytes
static/event/2012/barcamp-dc/bah.jpg | Bin 48567 -> 0 bytes
static/event/2012/barcamp-dc/bti360.jpg | Bin 11364 -> 0 bytes
static/event/2012/barcamp-dc/nic_logo_gray.png | Bin 22415 -> 0 bytes
static/event/2012/barcamp-dc/saic.jpg | Bin 39672 -> 0 bytes
static/event/2012/barcamp-lk/.htaccess | 1 -
static/event/2013/barcamp-bos/basis.png | Bin 98898 -> 0 bytes
static/event/2013/barcamp-bos/hippo.png | Bin 36372 -> 0 bytes
static/images/BarCamp-Bos.jpg | Bin 47197 -> 0 bytes
static/images/BarCamp-DC.jpg | Bin 237525 -> 0 bytes
static/js/bootstrap-collapse.js | 138 -
.../logos/BarCampApache/BarCampApacheBanner.ai | 7218 --------------------
.../BarCampApache/BarCampApacheBanner_600.png | Bin 35887 -> 0 bytes
.../logos/BarCampApache/BarCampApacheLogo.ai | 6942 -------------------
.../logos/BarCampApache/BarCampApacheLogo_600.png | Bin 35548 -> 0 bytes
.../organize/logos/BarCampApache/BarCampBanner.ai | 7093 -------------------
.../logos/BarCampApache/BarCampBanner_600.png | Bin 40207 -> 0 bytes
.../BarCampApache/Sydney_2010_TShirt_TwoColour.pdf | 1112 ---
.../BarCampApache/Sydney_2010_TShirt_TwoColour.png | Bin 48273 -> 0 bytes
static/style/bootstrap-responsive.css | 581 --
static/style/bootstrap.css | 3496 ----------
42 files changed, 21 insertions(+), 27202 deletions(-)
delete mode 100755 layouts/barcamp-bos/baseof.html
delete mode 100755 layouts/barcamp-bos/list.html
delete mode 100755 layouts/barcamp-bos/single.html
delete mode 100755 layouts/barcamp-dc/baseof.html
delete mode 100755 layouts/barcamp-dc/list.html
delete mode 100755 layouts/barcamp-dc/single.html
delete mode 100644 source/event/2012/barcamp-dc/__index.md
delete mode 100644 source/event/2012/barcamp-dc/news.md
delete mode 100644 source/event/2012/barcamp-dc/privacy.md
delete mode 100644 source/event/2012/barcamp-dc/registration.md
delete mode 100644 source/event/2012/barcamp-dc/sponsors.md
delete mode 100644 source/event/2012/barcamp-dc/venue.md
delete mode 100644 source/event/2012/barcamp-lk/__index.md
delete mode 100644 source/event/2013/barcamp-bos/__index.md
delete mode 100644 source/event/2013/barcamp-bos/news.md
delete mode 100644 source/event/2013/barcamp-bos/privacy.md
delete mode 100644 source/event/2013/barcamp-bos/registration.md
delete mode 100644 source/event/2013/barcamp-bos/sponsors.md
delete mode 100644 source/event/2013/barcamp-bos/venue.md
delete mode 100644 static/event/2012/barcamp-dc/alfresco.png
delete mode 100644 static/event/2012/barcamp-dc/bah.jpg
delete mode 100644 static/event/2012/barcamp-dc/bti360.jpg
delete mode 100644 static/event/2012/barcamp-dc/nic_logo_gray.png
delete mode 100644 static/event/2012/barcamp-dc/saic.jpg
delete mode 100644 static/event/2012/barcamp-lk/.htaccess
delete mode 100644 static/event/2013/barcamp-bos/basis.png
delete mode 100644 static/event/2013/barcamp-bos/hippo.png
delete mode 100644 static/images/BarCamp-Bos.jpg
delete mode 100644 static/images/BarCamp-DC.jpg
delete mode 100644 static/js/bootstrap-collapse.js
delete mode 100644 static/organize/logos/BarCampApache/BarCampApacheBanner.ai
delete mode 100644 static/organize/logos/BarCampApache/BarCampApacheBanner_600.png
delete mode 100644 static/organize/logos/BarCampApache/BarCampApacheLogo.ai
delete mode 100644 static/organize/logos/BarCampApache/BarCampApacheLogo_600.png
delete mode 100644 static/organize/logos/BarCampApache/BarCampBanner.ai
delete mode 100644 static/organize/logos/BarCampApache/BarCampBanner_600.png
delete mode 100644 static/organize/logos/BarCampApache/Sydney_2010_TShirt_TwoColour.pdf
delete mode 100644 static/organize/logos/BarCampApache/Sydney_2010_TShirt_TwoColour.png
delete mode 100644 static/style/bootstrap-responsive.css
delete mode 100644 static/style/bootstrap.css
[comdev-events-site] 01/02: Merge branch 'obsolete' into preview/test
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch preview/test
in repository https://gitbox.apache.org/repos/asf/comdev-events-site.git
commit ab2b6fe537c90fef16cde14ab25da8c9617efc05
Merge: aa42054 5f825f5
Author: Sebb <se...@apache.org>
AuthorDate: Sun Apr 2 23:11:42 2023 +0100
Merge branch 'obsolete' into preview/test
layouts/barcamp-bos/baseof.html | 166 -
layouts/barcamp-bos/list.html | 3 -
layouts/barcamp-bos/single.html | 3 -
layouts/barcamp-dc/baseof.html | 174 -
layouts/barcamp-dc/list.html | 3 -
layouts/barcamp-dc/single.html | 3 -
source/event/2012/barcamp-dc/__index.md | 16 -
source/event/2012/barcamp-dc/news.md | 11 -
source/event/2012/barcamp-dc/privacy.md | 24 -
source/event/2012/barcamp-dc/registration.md | 25 -
source/event/2012/barcamp-dc/sponsors.md | 48 -
source/event/2012/barcamp-dc/venue.md | 20 -
source/event/2012/barcamp-lk/__index.md | 10 -
source/event/2013/barcamp-bos/__index.md | 18 -
source/event/2013/barcamp-bos/news.md | 13 -
source/event/2013/barcamp-bos/privacy.md | 20 -
source/event/2013/barcamp-bos/registration.md | 12 -
source/event/2013/barcamp-bos/sponsors.md | 22 -
source/event/2013/barcamp-bos/venue.md | 18 -
static/event/2012/barcamp-dc/alfresco.png | Bin 24579 -> 0 bytes
static/event/2012/barcamp-dc/bah.jpg | Bin 48567 -> 0 bytes
static/event/2012/barcamp-dc/bti360.jpg | Bin 11364 -> 0 bytes
static/event/2012/barcamp-dc/nic_logo_gray.png | Bin 22415 -> 0 bytes
static/event/2012/barcamp-dc/saic.jpg | Bin 39672 -> 0 bytes
static/event/2012/barcamp-lk/.htaccess | 1 -
static/event/2013/barcamp-bos/basis.png | Bin 98898 -> 0 bytes
static/event/2013/barcamp-bos/hippo.png | Bin 36372 -> 0 bytes
static/images/BarCamp-Bos.jpg | Bin 47197 -> 0 bytes
static/images/BarCamp-DC.jpg | Bin 237525 -> 0 bytes
static/js/bootstrap-collapse.js | 138 -
.../logos/BarCampApache/BarCampApacheBanner.ai | 7218 --------------------
.../BarCampApache/BarCampApacheBanner_600.png | Bin 35887 -> 0 bytes
.../logos/BarCampApache/BarCampApacheLogo.ai | 6942 -------------------
.../logos/BarCampApache/BarCampApacheLogo_600.png | Bin 35548 -> 0 bytes
.../organize/logos/BarCampApache/BarCampBanner.ai | 7093 -------------------
.../logos/BarCampApache/BarCampBanner_600.png | Bin 40207 -> 0 bytes
.../BarCampApache/Sydney_2010_TShirt_TwoColour.pdf | 1112 ---
.../BarCampApache/Sydney_2010_TShirt_TwoColour.png | Bin 48273 -> 0 bytes
static/style/bootstrap-responsive.css | 581 --
static/style/bootstrap.css | 3496 ----------
40 files changed, 27190 deletions(-)
[comdev-events-site] 02/02: Merge branch 'pagefind' into preview/test
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch preview/test
in repository https://gitbox.apache.org/repos/asf/comdev-events-site.git
commit 8e1c4f6cb0fc40f88c5019dad5cef8fdc035a606
Merge: ab2b6fe a4fea4c
Author: Sebb <se...@apache.org>
AuthorDate: Sun Apr 2 23:19:49 2023 +0100
Merge branch 'pagefind' into preview/test
Jenkinsfile | 24 ++++++++++++------------
source/_index.md | 9 +++++++++
2 files changed, 21 insertions(+), 12 deletions(-)
diff --cc Jenkinsfile
index 4cd2507,8208e20..ea71331
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -23,8 -23,10 +23,9 @@@ pipeline
}
environment {
-- HUGO_VERSION = '0.63.2'
- DEPLOY_BRANCH = 'asf-site'
- PAGEFIND_VERSION = '0.12.0'
- PAGEFIND_HASH = '3e450176562b65359f855c04894ec2c07ffd30a8d08ef4d5812f8d3469d7a58f'
++ HUGO_VERSION = '0.111.3'
++ HUGO_HASH = 'b382aacb522a470455ab771d0e8296e42488d3ea4e61fe49c11c32ec7fb6ee8b'
+ DEPLOY_BRANCH = 'preview/test-staging'
}
stages {
@@@ -34,15 -36,25 +35,15 @@@
// Capture last commit hash for final commit message
env.LAST_SHA = sh(script:'git log -n 1 --pretty=format:\'%H\'', returnStdout: true).trim()
-- // Setup Hugo
++ // Download Hugo
env.HUGO_DIR = sh(script:'mktemp -d', returnStdout: true).trim()
-- sh """
-- mkdir -p ${env.HUGO_DIR}/bin
-- cd ${env.HUGO_DIR}
-- wget --no-verbose -O hugo.tar.gz https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz
-- tar xfzv hugo.tar.gz
-- mv hugo ${env.HUGO_DIR}/bin/
-- """
-
- // Download Pagefind
- env.PAGEFIND_DIR = sh(script:'mktemp -d', returnStdout: true).trim()
- sh "mkdir -p ${env.PAGEFIND_DIR}/bin"
- sh "wget --no-verbose -O ${env.PAGEFIND_DIR}/pagefind.tar.gz https://github.com/CloudCannon/pagefind/releases/download/v${PAGEFIND_VERSION}/pagefind-v${PAGEFIND_VERSION}-x86_64-unknown-linux-musl.tar.gz"
++ sh "mkdir -p ${env.HUGO_DIR}/bin"
++ sh "wget --no-verbose -O ${env.HUGO_DIR}/hugo.tar.gz https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz"
+ // Verify the checksum
- def pagefind_hash = sha256 file: "${env.PAGEFIND_DIR}/pagefind.tar.gz"
- assert pagefind_hash == "${PAGEFIND_HASH}"
- // Unpack Pagefind
- sh "tar -C ${env.PAGEFIND_DIR}/bin -xkf ${env.PAGEFIND_DIR}/pagefind.tar.gz"
++ def hugo_hash = sha256 file: "${env.HUGO_DIR}/hugo.tar.gz"
++ assert hugo_hash == "${HUGO_HASH}"
++ // Unpack Hugo
++ sh "tar -C ${env.HUGO_DIR}/bin -xkf ${env.HUGO_DIR}/hugo.tar.gz"
// Setup directory structure for generated content
env.TMP_DIR = sh(script:'mktemp -d', returnStdout: true).trim()
@@@ -55,9 -67,10 +56,8 @@@
stage('Build') {
steps {
script {
-- withEnv(["PATH+HUGO=${env.HUGO_DIR}/bin"]) {
-- sh "hugo --destination ${env.OUT_DIR}"
-- }
- sh "${env.PAGEFIND_DIR}/bin/pagefind --source ${env.OUT_DIR}"
++ sh "${env.HUGO_DIR}/bin/hugo --destination ${env.OUT_DIR}"
++ sh "npx -y pagefind --source ${env.OUT_DIR}"
}
}
}