Skip to content

Commit

Permalink
base URL is not needed anymore
Browse files Browse the repository at this point in the history
no develop branch from now and on

Signed-off-by: Hofi <[email protected]>
  • Loading branch information
HofiOne committed May 6, 2024
1 parent 98faa66 commit bdf8650
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 17 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Deploy Jekyll site to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["master", "develop"]
branches: ["master"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down Expand Up @@ -49,23 +49,23 @@ jobs:
run: |
echo "Updating navigation.yml"
pwd
# Last param turns off jekyll build for the links, let it be done in the next step
# Last param turns off jekyll build for the links, let it be done in the next step
# with the same parameters we use for the real site build
#
./_tools/navgen "./doc" "./_data/navigation.yml" "no"
ls -Al _data/navigation.yml
# This one is just for sure to have our final scripts result inplace
# This one is just for sure to have our final scripts result inplace
# as in the following _site build step the assets/js folder will be modified unfortunately
# Theoretically, the site build will not hurt the already presented files
# See bellow for more
#
echo "Updating main.min.js and re-pack js scripts"
pwd
./_tools/pack debug
./_tools/pack debug
ls -AlR assets/js
- name: Build with Jekyll
Expand All @@ -78,7 +78,7 @@ jobs:
JEKYLL_BUILD_TOOLTIPS=yes bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
ls -AlR ./_site/assets/js
ls -AlR ./_site/assets/js
env:
JEKYLL_ENV: production

Expand All @@ -92,7 +92,7 @@ jobs:
run: |
echo "Updating main.min.js and re-pack js scripts"
pwd
./_tools/pack debug
ls -AlR _site/assets/js
Expand Down
16 changes: 8 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ whitelist:

# Reading Files
#
# Every file or directory beginning with the following characters:
# ., _ , # or ~
# in the source directory will not be included in the destination folder. Such paths will have to be explicitly specified via the config file in the
# Every file or directory beginning with the following characters:
# ., _ , # or ~
# in the source directory will not be included in the destination folder. Such paths will have to be explicitly specified via the config file in the
# include directive to make sure they’re copied over
# In Jekyll 3, the `exclude` configuration option replaces the default exclusion list.
# In Jekyll 4, user-provided entries get added to the default exclusion list instead and the `include` option can be used to override the default exclusion list entries.
Expand Down Expand Up @@ -62,7 +62,7 @@ exclude:
# TODO: These are now packed into assets/js/main.min.js, not needed, but the _site building still adds them, double check the references why
# Also the doc snippet above is lieing, if this is presented the include: will not add e.g. assets/js/lunr even it is presented over there
#- assets/js
- _js/
- _js/
- _tools/
- Gemfile
- Gemfile.lock
Expand All @@ -76,7 +76,7 @@ sass:
sass_dir: _sass/minimal-mistakes
style: compressed # https://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style

# Note: If you assign footer_scripts the theme’s /assets/js/main.min.js file will be deactivated.
# Note: If you assign footer_scripts the theme’s /assets/js/main.min.js file will be deactivated.
# This script includes jQuery and various other plugins that you’ll need to find replacements for and include separately.
# https://mmistakes.github.io/minimal-mistakes/docs/javascript/
#
Expand All @@ -98,7 +98,7 @@ author:
# For user/organization pages set this to an empty string
# When working locally use jekyll serve --baseurl '' so that you can view everything at localhost:4000
# See http://jekyllrb.com/docs/github-pages/ or https://byparker.com/blog/2014/clearing-up-confusion-around-baseurl/ for more info
baseurl: /doc
baseurl:

# Point the logo URL at a file in your repo or hosted elsewhere by your organization
logourl: /assets/images/favicons/mstile-150x150.png
Expand Down Expand Up @@ -157,7 +157,7 @@ defaults:

# Developer guide pages
- scope:
type: dev-guide
type: dev-guide
values:
sidebar:
nav: "dev-guide-nav"
Expand All @@ -178,7 +178,7 @@ lunr:
# index_name: # YOUR_INDEX_NAME
# search_only_api_key: # YOUR_SEARCH_ONLY_API_KEY
# powered_by: # true (default), false

# Markdown and sytax higlighting
# https://jekyllrb.com/docs/configuration/markdown/
markdown_ext: "markdown,mkdown,mkdn,mkd,md"
Expand Down
6 changes: 6 additions & 0 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ admin-guide-nav:
url: /admin-guide/060_Sources/020_File/000_Notes_on_reading_kernel_messages
- title: "file() source options"
url: /admin-guide/060_Sources/020_File/001_File_source_options
- title: "Arr logs"
url: /admin-guide/060_Sources/025_Arr_logs/README
subnav:
- title: "wildcard-file"
url: /admin-guide/060_Sources/030_Wildcard-file/README
subnav:
Expand Down Expand Up @@ -202,6 +205,9 @@ admin-guide-nav:
subnav:
- title: "osquery() source options"
url: /admin-guide/060_Sources/100_osquery/000_osquery_source_options
- title: "Pi-hole FTL"
url: /admin-guide/060_Sources/105_pi-hole-FTL/README
subnav:
- title: "pipe"
url: /admin-guide/060_Sources/110_Pipe/README
subnav:
Expand Down

0 comments on commit bdf8650

Please sign in to comment.