Skip to content

Commit dec4297

Browse files
russfeldrussfeld
committed
Bump Theme 5.18
1 parent 47858d5 commit dec4297

19 files changed

Lines changed: 71 additions & 319 deletions

File tree

‎.github/workflows/gh-pages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Setup Hugo
2323
uses: peaceiris/actions-hugo@v2
2424
with:
25-
hugo-version: '0.101.0'
25+
hugo-version: '0.117.0'
2626
# extended: true
2727

2828
- name: Build
29-
run: hugo --config github.toml
29+
run: hugo -b "https://ksu-cs-textbooks.github.io/cis301/"
3030

3131
- name: Deploy
3232
uses: peaceiris/actions-gh-pages@v3

‎.gitlab-ci.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
image: docker:20.10.11
1+
# image: docker:20.10.11
22

3-
variables:
4-
# When using dind service, you must instruct docker to talk with the
5-
# daemon started inside of the service. The daemon is available with
6-
# a network connection instead of the default /var/run/docker.sock socket.
7-
#
8-
# The 'docker' hostname is the alias of the service container as described at
9-
# https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
10-
#
11-
# If you're using GitLab Runner 12.7 or earlier with the Kubernetes executor and Kubernetes 1.6 or earlier,
12-
# the variable must be set to tcp://localhost:2375 because of how the
13-
# Kubernetes executor connects services to the job container
14-
# DOCKER_HOST: tcp://localhost:2375
15-
#
16-
DOCKER_HOST: tcp://docker:2375
17-
#
18-
# This instructs Docker not to start over TLS.
19-
DOCKER_TLS_CERTDIR: ""
20-
#
21-
# Checkout submodules recursively
22-
GIT_SUBMODULE_STRATEGY: recursive
3+
# variables:
4+
# # When using dind service, you must instruct docker to talk with the
5+
# # daemon started inside of the service. The daemon is available with
6+
# # a network connection instead of the default /var/run/docker.sock socket.
7+
# #
8+
# # The 'docker' hostname is the alias of the service container as described at
9+
# # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
10+
# #
11+
# # If you're using GitLab Runner 12.7 or earlier with the Kubernetes executor and Kubernetes 1.6 or earlier,
12+
# # the variable must be set to tcp://localhost:2375 because of how the
13+
# # Kubernetes executor connects services to the job container
14+
# # DOCKER_HOST: tcp://localhost:2375
15+
# #
16+
# DOCKER_HOST: tcp://docker:2375
17+
# #
18+
# # This instructs Docker not to start over TLS.
19+
# DOCKER_TLS_CERTDIR: ""
20+
# #
21+
# # Checkout submodules recursively
22+
# GIT_SUBMODULE_STRATEGY: recursive
2323

24-
services:
25-
- docker:20.10.11-dind
24+
# services:
25+
# - docker:20.10.11-dind
2626

27-
before_script:
28-
- docker info
29-
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
27+
# before_script:
28+
# - docker info
29+
# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
3030

31-
build-latest:
32-
stage: build
33-
only:
34-
- tags
35-
script:
36-
- docker pull $CI_REGISTRY_IMAGE:latest || true
37-
- docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
38-
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
39-
- docker push $CI_REGISTRY_IMAGE:latest
31+
# build-latest:
32+
# stage: build
33+
# only:
34+
# - tags
35+
# script:
36+
# - docker pull $CI_REGISTRY_IMAGE:latest || true
37+
# - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
38+
# - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
39+
# - docker push $CI_REGISTRY_IMAGE:latest
4040

4141
# build-branches:
4242
# stage: build

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ FROM nginx:alpine as build
33
RUN apk add --update \
44
wget
55

6-
ARG HUGO_VERSION="0.101.0"
6+
ARG HUGO_VERSION="0.117.0"
77
RUN wget --quiet "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz" && \
88
tar xzf hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
99
rm -r hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
1010
mv hugo /usr/bin
1111

1212
COPY ./ /site
1313
WORKDIR /site
14-
RUN hugo --config docker.toml
14+
RUN hugo -b https://cis301.textbooks.cs.ksu.edu/
1515

1616
#Copy static files to Nginx
1717
FROM nginx:alpine

‎config.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ theme = "hugo-theme-relearn"
2020
# TELE - Teleprompter
2121
# EMBED - Embeddable Version
2222
[outputs]
23-
home = ["HTML", "RSS", "PRINT", "JSON"]
23+
home = ["HTML", "RSS", "PRINT", "SEARCH", "SEARCHPAGE"]
2424
section = ["HTML", "RSS", "PRINT", "TELE", "EMBED"]
2525
page = ["HTML", "RSS", "PRINT", "TELE", "EMBED"]
2626

@@ -87,7 +87,9 @@ theme = "hugo-theme-relearn"
8787
# this can be overridden in the pages frontmatter
8888
ordersectionsby = "weight"
8989
# Change default color scheme with a variant one. Eg. can be "red", "blue", "green" or an array like [ "blue", "green" ].
90-
themeVariant = ["light-theme", "dark-theme"]
90+
themeVariant = ["auto", "light-theme", "dark-theme"]
91+
# The first element is the variant for light mode, the second for dark mode
92+
themeVariantAuto = ["light-theme", "dark-theme"]
9193
# Change the title separator. Default to "::".
9294
# titleSeparator = "-"
9395
# If set to true, the menu in the sidebar will be displayed in a collapsible tree view.

‎content/0-chapter/_index.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
title = "Getting Started"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 1
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "0"
67
pre = "<b>0. </b>"
78
+++
8-
9-
# Getting Started

‎content/1-chapter/_index.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
title = "Basics and Logic Puzzles"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 2
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "1"
67
pre = "<b>1. </b>"
78
+++
8-
9-
### Chapter 1
10-
11-
# Basics and Logic Puzzles

‎content/10-chapter/_index.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title = "Sequences, Globals, and Termination"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 11
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "10"
67
pre = "<b>10. </b>"
78
+++
8-
### Chapter 10
99

10-
# Programming Logic: Sequences, Global Variables, and Termination
10+
###### Programming Logic: Sequences, Global Variables, and Termination
1111

1212
In our conclusion of programming logic, we'll examines programs with sequences and global variables. We'll also learn the idea of *termination* in programs, and why this is a much more difficult thing to demonstrate for a general program that it might seem.

‎content/2-chapter/_index.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
title = "Truth Tables"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 3
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "2"
67
pre = "<b>2. </b>"
78
+++
8-
### Chapter 2
9-
10-
# Truth Tables

‎content/3-chapter/_index.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
title = "Propositional Logic Translations"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 4
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "3"
67
pre = "<b>3. </b>"
78
+++
8-
### Chapter 3
9-
10-
# Propositional Logic Translations
119

1210
A *propositional logic statement* is a set of *propositional atoms* (statements with no logical connectives that can be true or false) connected by logical operators.
1311

‎content/4-chapter/_index.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
title = "Propositional Logic Proofs"
33
date = 2018-08-24T10:53:05-05:00
44
weight = 5
5-
chapter = true
5+
archetype = "chapter"
6+
ordinal = "5"
67
pre = "<b>4. </b>"
78
+++
8-
### Chapter 4
9-
10-
# Propositional Logic Proofs

0 commit comments

Comments
 (0)