infrastructure/hugo-fresh
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fixIssue#27-section3-image-overlaps-section2-feature-illustrations' of github.com:nathanbiller/hugo-fresh into fixIssue#27-section3-image-overlaps-section2-feature-illustrations

Browse Source
This commit is contained in:
Nathan Biller
2019-09-25 08:52:09 -04:00
parent 99a9df2dca 06c4f06613
commit ab59c23860
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.circleci/config.yml
View File

@@ -22,10 +22,13 @@ jobs:
- run:
working_directory: my-site/themes/hugo-fresh
command: |
if [[ ${CIRCLE_BRANCH} == "*pull*" ]]; then
isPrIfGreaterThanZero=$(expr $CIRCLE_BRANCH : "pull")
if [ isPrIfGreaterThanZero > 0 ]; then
echo "Hello World $CIRCLE_BRANCH"
git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME
git checkout BRANCHNAME
else
echo "Hello World else $CIRCLE_BRANCH"
git checkout ${CIRCLE_BRANCH}
fi
@@ -33,9 +36,9 @@ jobs:
name: Replace default config
working_directory: my-site
command: |
if [[ ${CIRCLE_BRANCH} == "*pull*" ]]; then
git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME
branch=BRANCHNAME
isPrIfGreaterThanZero=$(expr $CIRCLE_BRANCH : "pull")
if [ isPrIfGreaterThanZero > 0 ]; then
branch=${CIRCLE_SHA1}
else
branch=${CIRCLE_BRANCH}
fi
@@ -47,7 +50,7 @@ jobs:
working_directory: my-site
command: |
apk add sed
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -)
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -)
if [ $CIRCLE_BRANCH == "master" ]; then
URL=hugo-fresh
fi
@@ -63,7 +66,7 @@ jobs:
name: Create now.json
working_directory: my-site/public
command: |
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -)
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -)
if [ $CIRCLE_BRANCH == "master" ]; then
URL=hugo-fresh
fi

1
exampleSite/config.yaml
View File

@@ -2,6 +2,7 @@ baseURL: http://something-fresh.org/
languageCode: en-us
title: Hugo Fresh Theme
theme: hugo-fresh
googleAnalytics: #Put in your tracking code without quotes like this: UA-XXXXXX...
params:
navbarlogo:

1
layouts/partials/meta.html
View File

@@ -1,3 +1,4 @@
{{ template "_internal/google_analytics_async.html" . }}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="x-ua-compatible" content="ie=edge">