Skip to content
Snippets Groups Projects
Unverified Commit 0481a4ac authored by Yi (Flora) Liu's avatar Yi (Flora) Liu Committed by GitHub
Browse files

Update theme to 111 and fix IE issue (#61)


* Update theme to 111 and fix IE issue

Signed-off-by: default avatarYi Liu <yi.liu@eclipse-foundation.org>

* simplify travis build

Signed-off-by: default avatarYi Liu <yi.liu@eclipse-foundation.org>

* Add postinstall

Signed-off-by: default avatarYi Liu <yi.liu@eclipse-foundation.org>

* use postinstall

Signed-off-by: default avatarYi Liu <yi.liu@eclipse-foundation.org>
parent 6a5ba486
No related branches found
No related tags found
No related merge requests found
language: node_js
matrix:
include:
- node_js: 10
env: HUGO_ENV=dev
- node_js: 12
env: HUGO_ENV=production
node_js:
- "12"
install:
- npm install
- npm ci
- wget https://github.com/gohugoio/hugo/releases/download/v0.76.5/hugo_0.76.5_Linux-64bit.deb
- sudo dpkg -i hugo*.deb
script:
- if [ "$HUGO_ENV" = "dev" ]; then hugo --gc --minify --buildFuture; fi;
- if [ "$HUGO_ENV" = "production" ]; then hugo --gc --minify ; fi;
\ No newline at end of file
- hugo --gc --minify --buildFuture
\ No newline at end of file
......@@ -3,7 +3,7 @@ ARG NGINX_IMAGE_TAG=stable-alpine-for-hugo
FROM debian:10-slim AS builder
ARG HUGO_VERSION=0.76.5
ARG NODE_VERSION=10.15.0
ARG NODE_VERSION=12.18.3
RUN apt-get update && apt-get install -y \
build-essential \
......
......@@ -29,7 +29,7 @@ pipeline {
parameters {
string(name: 'hugo_version', defaultValue: '0.76.5', description: 'The Hugo version that will be used to build the website. Must match versions speficied on https://github.com/gohugoio/hugo/releases.')
string(name: 'node_version', defaultValue: '10.15.3', description: 'The Node.js version that will be used to build the website. Must match versions specified on https://nodejs.org/en/download/releases/. It is adivsed to stick to LTS versions.')
string(name: 'node_version', defaultValue: '12.18.3', description: 'The Node.js version that will be used to build the website. Must match versions specified on https://nodejs.org/en/download/releases/. It is adivsed to stick to LTS versions.')
}
environment {
......
......@@ -11,6 +11,7 @@ types:
title: Chevron
link: https://www.chevron.com/
img_width: 120
img_height: 116
-
image: /images/sparkplug/members/cirrus-link-solutions.png
title: Cirrus Link
......@@ -21,6 +22,7 @@ types:
title: HiveMQ
link: https://www.hivemq.com/
img_width: 200
img_height: 47
-
image: /images/sparkplug/members/inductive-automation-logo.png
title: Inductive Automation
......
......@@ -15,7 +15,7 @@
<h2>Founding Members</h2>
<ul class="list-inline margin-bottom-0">
{{ range $data.items }}
<li><a href="{{ .link }}"><img class="founder-logo" width="{{ .img_width }}" alt="{{ .title }}" src="{{ .image }}"></a></li>
<li><a href="{{ .link }}"><img class="founder-logo" {{ if isset . "img_height" }} height="{{ .img_height }}" {{ end }} {{ if isset . "img_width" }} width="{{ .img_width }}" {{ end }} alt="{{ .title }}" src="{{ .image }}"></a></li>
{{ end }}
</ul>
</div>
......
......@@ -2,6 +2,9 @@
publish = "public"
command = "npm run build_netlify && hugo --gc --minify -b https://eclipsefdn-sparkplug.netlify.com"
[build.environment]
NODE_VERSION = "12.18.3"
[context.production.environment]
HUGO_VERSION = "0.76.5"
HUGO_ENV = "production"
......
This diff is collapsed.
......@@ -13,15 +13,16 @@
"url": "git://github.com/eclipsefdn/sparkplug.eclipse.org.git"
},
"scripts": {
"dev": "NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"dev": "NODE_ENV=development webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "NODE_ENV=development webpack --watch --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"production": "NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"install": "NODE_ENV=production npm run production",
"production": "NODE_ENV=production webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"disallow_robots_txt": "echo \"User-agent: *\r\nDisallow: /\" > layouts/robots.txt",
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production"
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production",
"postinstall": "NODE_ENV=production npm run production"
},
"dependencies": {
"eclipsefdn-hugo-solstice-theme": "0.0.107"
}
"eclipsefdn-hugo-solstice-theme": "0.0.111"
},
"browserslist": "last 5 version, > 0.2%, not dead, IE 11"
}
......@@ -19,7 +19,7 @@ mix.setResourceRoot('../');
mix.less('./less/styles.less', 'static/css/styles.css');
mix.scripts([
mix.babel([
'./node_modules/jquery/dist/jquery.min.js',
'./node_modules/bootstrap/dist/js/bootstrap.min.js',
'./node_modules/jquery-match-height/dist/jquery.matchHeight-min.js',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment