Skip to content

Commit c645fbb

Browse files
committed
config and ghpages fixes
1 parent 77f3fdd commit c645fbb

File tree

2 files changed

+38
-11
lines changed

2 files changed

+38
-11
lines changed

.github/workflows/gh-pages.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,53 @@ on:
99
push:
1010
branches: [ master ]
1111

12-
env:
13-
HUGO_ENV: production
12+
#env:
13+
# HUGO_ENV: production
1414

1515
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1616
jobs:
1717
# This workflow contains a single job called "deploy"
1818
deploy:
1919
# The type of runner that the job will run on
20-
runs-on: ubuntu-20.04
21-
20+
runs-on: ubuntu-22.04
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.ref }}
2223
# Steps represent a sequence of tasks that will be executed as part of the job
2324
steps:
2425

2526
# Step 1 - Checks-out your repository under $GITHUB_WORKSPACE
2627
- name: Checkout
27-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
2829
with:
2930
submodules: true # Fetch Hugo themes
3031
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
3132

3233
# Step 2 - Sets up the latest version of Hugo
3334
- name: Setup Hugo
34-
uses: peaceiris/actions-hugo@v2
35+
uses: peaceiris/actions-hugo@v3
36+
with:
37+
hugo-version: '0.119.0'
38+
39+
- name: Setup Ruby
40+
uses: ruby/setup-ruby@v1
3541
with:
36-
hugo-version: 'latest'
42+
ruby-version: 3.2
43+
44+
- run: gem install asciidoctor
45+
46+
- name: Run Hugo
47+
run: |
48+
alias asciidoctor="asciidoctor --attribute=experimental=true --attribute=icons=font"
49+
hugo --minify
3750
3851
# Step 3 - Clean and don't fail
3952
- name: Clean public directory
4053
run: rm -rf public
4154

4255
# Step 4 - Builds the site using the latest version of Hugo
4356
# Also specifies the theme we want to use
44-
- name: Build
45-
run: hugo --theme=ananke
57+
#- name: Build
58+
# run: hugo --theme=ananke
4659

4760
# Step 5 - Create name file
4861
#- name: Create cname file
@@ -51,6 +64,7 @@ jobs:
5164
# Step 6 - Push our generated site to our gh-pages branch
5265
- name: Deploy
5366
uses: peaceiris/actions-gh-pages@v3
67+
if: ${{ github.ref == 'refs/heads/main' }}
5468
with:
55-
github_token: ${{ secrets.GITHUB_TOKEN }}
69+
github_token: ${{ secrets.JMHREIF_COM_TOKEN }}
5670
publish_dir: ./public

config.toml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,17 @@ url = "https://twitter.com/DataWave_VESRI"
8282
trace = false
8383
verbose = false
8484
workingFolderCurrent = false
85-
[markup.asciidocExt.attributes]
85+
[markup.asciidocExt.attributes]
86+
87+
[security]
88+
enableInlineShortcodes = false
89+
[security.exec]
90+
allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$', '^asciidoctor$']
91+
osEnv = ['(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$']
92+
93+
[security.funcs]
94+
getenv = ['^HUGO_']
95+
96+
[security.http]
97+
methods = ['(?i)GET|POST']
98+
urls = ['.*']

0 commit comments

Comments
 (0)