From e63f84b044d12be6d487b8d4d270f45d7da6ae5e Mon Sep 17 00:00:00 2001 From: John Bintz <27256+johnbintz@users.noreply.github.com> Date: Wed, 22 Apr 2020 17:37:19 -0400 Subject: [PATCH] 0.69.1 --- .sandstorm/sandstorm-files.list | 9 +++++---- .sandstorm/sandstorm-pkgdef.capnp | 4 ++-- .sandstorm/setup.sh | 4 ++-- hugo-version | 1 + nuxt.config.js | 8 ++++++-- pages/index.vue | 4 +++- 6 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 hugo-version diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index f74e165..10964fc 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -90,15 +90,16 @@ lib64/ld-linux-x86-64.so.2 opt/app opt/app/.babelrc opt/app/.cloudcmd.menu.js -opt/app/.nuxt/dist/0.nuxt.bundle.ef50340c3600ea7e30a7.js +opt/app/.nuxt/dist/0.nuxt.bundle.aed0810b10ee27bc1f4c.js opt/app/.nuxt/dist/1.nuxt.bundle.89a9958091c34dcc68ed.js opt/app/.nuxt/dist/index.html -opt/app/.nuxt/dist/manifest.7c112ec70f8b3c557a15.js -opt/app/.nuxt/dist/nuxt.bundle.dbf51a8ed53569a6c1b0.js +opt/app/.nuxt/dist/manifest.24786bf1655f163f53d8.js +opt/app/.nuxt/dist/nuxt.bundle.83d0779466233bb9bf53.js opt/app/.nuxt/dist/server-bundle.json -opt/app/.nuxt/dist/vendor.bundle.7c112ec70f8b3c557a15.js +opt/app/.nuxt/dist/vendor.bundle.24786bf1655f163f53d8.js opt/app/.sandstorm/launcher.sh opt/app/README.md +opt/app/hugo-version opt/app/node_modules/.bin/babel-node opt/app/node_modules/@babel/code-frame/lib/index.js opt/app/node_modules/@babel/code-frame/package.json diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index f43ac25..aa6053e 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Hugo"), - appVersion = 4, # Increment this for every release. + appVersion = 5, # Increment this for every release. - appMarketingVersion = (defaultText = "0.69.0~2020-04-21"), + appMarketingVersion = (defaultText = "0.69.1~2020-04-22"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index a1c5a90..7ef1982 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -5,8 +5,8 @@ set -euo pipefail -export HUGO_VERSION=0.69.0 -export NODE_VERSION=10 +export HUGO_VERSION=$(cat /opt/app/hugo-version) +export NODE_VERSION=$(cat /opt/app/.nvmrc) apt-get update apt-get install -y git diff --git a/hugo-version b/hugo-version new file mode 100644 index 0000000..a868f07 --- /dev/null +++ b/hugo-version @@ -0,0 +1 @@ +0.69.1 diff --git a/nuxt.config.js b/nuxt.config.js index 5640232..a9c4f6b 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,9 +1,12 @@ +var fs = require('fs') +var hugoVersion = fs.readFileSync('hugo-version').toString() + module.exports = { /* ** Headers of the page */ head: { - titleTemplate: "%s - Hugo", + titleTemplate: `%s - hugo-standstorm v${hugoVersion}`, meta: [ { charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' } @@ -13,7 +16,8 @@ module.exports = { ** Add env variables */ env: { - baseURL: process.env.BASE_URL || "http://127.0.0.1:8000" + baseURL: process.env.BASE_URL || "http://127.0.0.1:8000", + hugoVersion: hugoVersion }, plugins: [ "~plugins/sandstorm" diff --git a/pages/index.vue b/pages/index.vue index 011bca4..eb89ed7 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,5 +1,6 @@