Skip to content

Commit 8039bfc

Browse files
authored
Merge pull request #39 from sharpred/develop
analytics
2 parents eeb3258 + 711ad79 commit 8039bfc

10 files changed

Lines changed: 43 additions & 36 deletions

File tree

.github/workflows/check.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
# This is a basic workflow to help you get started with Actions
2-
31
name: CI
42

5-
# Controls when the action will run. Triggers the workflow on push or pull request
6-
# events but only for the master branch
73
on:
84
pull_request:
95
branches: [ master ]
106

11-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
127
jobs:
13-
# This workflow contains a single job called "build"
148
buildandhtmlproof:
15-
# The type of runner that the job will run on
169
runs-on: self-hosted
1710

18-
# Steps represent a sequence of tasks that will be executed as part of the job
1911
steps:
20-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2112
- uses: actions/checkout@v2
2213

23-
# Runs a single command using the runners shell
2414
- name: install prerequisites
2515
run: gem install minima jekyll html-proofer
2616

Gemfile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
source "https://rubygems.org"
22
ruby RUBY_VERSION
33

4-
# Hello! This is where you manage which Jekyll version is used to run.
5-
# When you want to use a different version, change it below, save the
6-
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
7-
#
8-
# bundle exec jekyll serve
9-
#
10-
# This will help ensure the proper Jekyll version is running.
11-
# Happy Jekylling!
124
gem "jekyll"
5+
gem 'jekyll-watch'
136

14-
# This is the default theme for new Jekyll sites. You may change this to anything you like.
157
gem "minima"
168
gem "html-proofer"
17-
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
18-
# uncomment the line below. To upgrade, run `bundle update github-pages`.
19-
#gem "github-pages", group: :jekyll_plugins
20-
21-
# If you have any plugins, put them here!
22-
# group :jekyll_plugins do
23-
# gem "jekyll-github-metadata", "~> 1.0"
24-
# end

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ blog site
33

44
## running locally
55

6-
I have had issues getting incremental builds to play nice, so I create an article and then `bundle exec jekyll build` before serving as detailed below.
7-
8-
Execute `bundle exec jekyll serve --incremental` to run this site locally. This will run the site at http://127.0.0.1:4000
6+
In a terminal window `bundle exec jekyll build --watch` before running `bundle exec jekyll serve --incremental` in a separate window. This will run the site at http://127.0.0.1:4000
97

_config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
title: Sharpred
22
email: paul@sharpred.com
33
description: > # this means to ignore newlines until "baseurl:"
4-
Personal site for Paul Ryan.
4+
Paul Ryan, Mobile App Developer
55
baseurl: "" # the subpath of your site, e.g. /blog
6-
url: "http://example.com" # the base hostname & protocol for your site
6+
url: "https://sharpred.com" # the base hostname & protocol for your site
77
twitter_username: sharpred
88
github_username: sharpred
99

@@ -12,5 +12,6 @@ markdown: kramdown
1212
theme: minima
1313
# from https://jekyllrb.com/docs/continuous-integration/
1414
exclude: [vendor, gcp, google575963d4adf7f984.html]
15-
# from http://jmcglone.com/guides/github-pages/
16-
#permalink: /blog/:year/:month/:day/:title
15+
16+
# Google services
17+
google_analytics: UA-179410290-1

_includes/analytics.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
2+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
3+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
4+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
5+
6+
ga('create', '{{ site.google_analytics }}', 'auto');
7+
ga('send', 'pageview');
8+

_includes/head.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<head>
2+
3+
<!-- Your head content -->
4+
5+
{% if jekyll.environment == 'production' %}
6+
{% include analytics.html %}
7+
{% endif %}
8+
9+
</head>
10+

_posts/2020-08-19-amending a pipeline.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,10 @@ it('This should pass', () => {
8585
})
8686
```
8787

88-
Commit your changes and push them to Github.
88+
Commit your changes and push them to Github. After a couple of minutes, your changes should trigger another pipeline job and this time it should run successfully.
8989

90+
Congratulations! you have just completed your first pipeline amendment. Remember to back up your Go Server and create a new Docker image with the resultant backup. Refer back to [here](/2020/07/09/adding-a-pipeline.html) if you need a refresher on how to do this.
91+
92+
Next Time
93+
94+
Next time we will look at deploying our application from a Go Server pipeline.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
layout: post
3+
title: Deploying an application from a Go Server pipeline
4+
author: Paul Ryan
5+
summary: Deploying an application from a Go Server pipeline
6+
date: 2020-10-01
7+
---
8+
9+
**Introduction**
10+
11+
//TODO

favicon.ico

68.1 KB
Binary file not shown.

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: Paul Ryan, Mobile App Consultant
3+
title: Paul Ryan, Mobile App Developer
44
---
55
<div class="blurb">
66
<h1>Welcome</h1>

0 commit comments

Comments
 (0)