Skip to content

Fix robots.txt #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 94 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
438d55c
Merge pull request #39 from stumbo/fixRobots.txt
stumbo Sep 6, 2024
1048d82
Cleanup
stumbo Sep 7, 2024
0bc7ce9
Merge pull request #40 from stumbo/fixRobots.txt
stumbo Sep 7, 2024
0d2c092
Testing
stumbo Sep 7, 2024
85df1ee
Merge pull request #41 from stumbo/fixRobots.txt
stumbo Sep 7, 2024
285bcb4
Add deploy step back in
stumbo Sep 7, 2024
7df6590
Merge pull request #42 from stumbo/fixRobots.txt
stumbo Sep 7, 2024
bb554a6
Updates to move out some of the peaceiris actions
stumbo Sep 7, 2024
c537daa
Merge pull request #43 from stumbo/fixRobots.txt
stumbo Sep 7, 2024
333a3f7
Fix typo
stumbo Sep 7, 2024
99da5f0
Merge pull request #44 from stumbo/fixRobots.txt
stumbo Sep 8, 2024
b9b242f
Updated deploy step
stumbo Sep 9, 2024
6e8241c
Merge pull request #45 from stumbo/fixRobots.txt
stumbo Sep 9, 2024
02dc8f8
Updates
stumbo Sep 9, 2024
dea642d
Merge pull request #46 from stumbo/fixRobots.txt
stumbo Sep 9, 2024
9ca369f
Fix typo
stumbo Sep 9, 2024
f416cf7
Merge pull request #47 from stumbo/fixRobots.txt
stumbo Sep 9, 2024
a7f0f5d
Change environment setup for hugo
stumbo Sep 10, 2024
6dd9262
Merge pull request #48 from stumbo/fixRobots.txt
stumbo Sep 10, 2024
2e528bd
Remvoe baseURL from staging
stumbo Sep 10, 2024
6621b15
Merge pull request #49 from stumbo/fixRobots.txt
stumbo Sep 10, 2024
156e4c7
another try
stumbo Sep 10, 2024
66f0018
Merge pull request #50 from stumbo/fixRobots.txt
stumbo Sep 10, 2024
e763008
add hugo logging
stumbo Sep 11, 2024
5967cc9
Merge pull request #51 from stumbo/fixRobots.txt
stumbo Sep 11, 2024
fb70fee
More tweeking
stumbo Sep 11, 2024
d5a7be6
Merge pull request #52 from stumbo/fixRobots.txt
stumbo Sep 11, 2024
9176395
More muck
stumbo Sep 12, 2024
1b579ef
Merge pull request #53 from stumbo/fixRobots.txt
stumbo Sep 12, 2024
68079a7
Yet more...
stumbo Sep 12, 2024
02cf2ad
Merge pull request #54 from stumbo/fixRobots.txt
stumbo Sep 12, 2024
7ade4a3
Stuff
stumbo Sep 12, 2024
cafc86c
Merge pull request #55 from stumbo/fixRobots.txt
stumbo Sep 12, 2024
6d69622
Fix
stumbo Sep 13, 2024
3edc0a3
Merge pull request #56 from stumbo/fixRobots.txt
stumbo Sep 13, 2024
a6338be
Add baseURL back
stumbo Sep 13, 2024
0e9df43
Merge pull request #57 from stumbo/fixRobots.txt
stumbo Sep 13, 2024
876a152
What going on with the build?
stumbo Sep 13, 2024
9997e7f
Merge pull request #58 from stumbo/fixRobots.txt
stumbo Sep 13, 2024
4e4f3d0
version
stumbo Sep 13, 2024
6c4b34c
Merge pull request #59 from stumbo/fixRobots.txt
stumbo Sep 13, 2024
66a43ea
Work
stumbo Sep 14, 2024
65370b6
Merge pull request #60 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
a25e098
More
stumbo Sep 14, 2024
ec9d61e
Merge pull request #61 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
58d99b2
Another
stumbo Sep 14, 2024
a83ecaa
Merge pull request #62 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
07d9de1
Remove public from .gitignore
stumbo Sep 14, 2024
b209b03
Merge pull request #63 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
1511b7f
Fix baseURL
stumbo Sep 14, 2024
2674130
Merge pull request #64 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
eb60746
more stuff
stumbo Sep 14, 2024
39b80c1
Merge pull request #65 from stumbo/fixRobots.txt
stumbo Sep 14, 2024
d3c9e5d
Update baseURL
stumbo Sep 15, 2024
2281633
Merge pull request #66 from stumbo/fixRobots.txt
stumbo Sep 15, 2024
666baff
More testing
stumbo Sep 15, 2024
d223c32
Merge pull request #67 from stumbo/fixRobots.txt
stumbo Sep 15, 2024
ae1e639
Add more
stumbo Sep 15, 2024
86014c0
Merge pull request #68 from stumbo/fixRobots.txt
stumbo Sep 15, 2024
088650f
Debug
stumbo Sep 16, 2024
0c1cc1e
Merge pull request #69 from stumbo/fixRobots.txt
stumbo Sep 16, 2024
4067179
Add publish Directory
stumbo Sep 16, 2024
5557c3c
Merge pull request #70 from stumbo/fixRobots.txt
stumbo Sep 16, 2024
f4e80ce
Add mkdir public
stumbo Sep 16, 2024
ffea777
Merge pull request #71 from stumbo/fixRobots.txt
stumbo Sep 16, 2024
5157777
More debug
stumbo Sep 16, 2024
d46efe9
Merge pull request #72 from stumbo/fixRobots.txt
stumbo Sep 16, 2024
05afa47
Update baseURL
stumbo Sep 16, 2024
dcf9dad
Merge pull request #73 from stumbo/fixRobots.txt
stumbo Sep 16, 2024
e433a18
Update baseURL
stumbo Sep 16, 2024
0a08520
Merge branch 'main' into fixRobots.txt
stumbo Sep 16, 2024
47532d0
More degut
stumbo Sep 16, 2024
6d96352
Merge remote-tracking branch 'origin/fixRobots.txt' into fixRobots.txt
stumbo Sep 16, 2024
c2b9140
Updates
stumbo Sep 16, 2024
571854a
Cleanup
stumbo Sep 16, 2024
c6bc7b2
Switch to direct download of Hugo
stumbo Sep 17, 2024
9344ab6
Replace peaceIris actions with stock github actions
stumbo Sep 17, 2024
d463df5
Update Permissions
stumbo Sep 17, 2024
30f4d71
Fix typo
stumbo Sep 17, 2024
5aa67e4
Continue cleanup
stumbo Sep 17, 2024
cdf8ca1
Revert relativeURLs flag for staging
stumbo Sep 17, 2024
d299d36
Add canonifyURLs back in
stumbo Sep 17, 2024
d187a10
Remove relativeURLs flag
stumbo Sep 17, 2024
654bb39
Cleanup
stumbo Sep 17, 2024
fb80639
Cleanup
stumbo Sep 17, 2024
4738d98
Rewind and retry
stumbo Sep 17, 2024
94c22e4
readd relativeURLs
stumbo Sep 17, 2024
0ea73cd
Add baseURL back in
stumbo Sep 17, 2024
4e1ffee
Replace absURL with relURL in body-end.html to
stumbo Sep 17, 2024
195bf18
Set to production for testing
stumbo Sep 18, 2024
f7e0156
Reset to staging after positive test
stumbo Sep 18, 2024
272663d
Cleanup
stumbo Sep 18, 2024
0c18ba0
Remove relativeURLs and canonifyURLs
stumbo Sep 18, 2024
12d96f2
Add comments to yaml
stumbo Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 51 additions & 20 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,26 @@ on:
push:
branches:
- main # Set a branch to deploy

schedule:
- cron: "0 3 * * *"

workflow_dispatch:

permissions:
contents: read
pages: write
id-token: write

defaults:
run:
shell: bash

env:
# ----------------------------------------------------------------------------
# Specify the deployment environment: staging or production
hugoEnvironment: production
HUGO_ENVIRONMENT: staging
HUGO_VERSION: 0.133.1

jobs:
# ----------------------------------------------------------------------------
Expand All @@ -42,6 +55,7 @@ jobs:
outputs:
zoteroVersion: ${{ fromJson(steps.zoteroVersion.outputs.headers).last-modified-version }}
cacheHit: ${{ steps.cache-zotero-bib.outputs.cache-hit }}

runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -66,19 +80,18 @@ jobs:
${{ fromJson(steps.zoteroVersion.outputs.headers).last-modified-version }}

# ----------------------------------------------------------------------------
# Deploy the website. This job is conditional, we will always run it on a
# Build the website. This job is conditional, we will always run it on a
# push or if on a scheduled run the cache was determined to be out of date.
#
deploy:
build:
needs: check
runs-on: ubuntu-latest
if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true'
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.18.1'

- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Cache Zotero Bibliography
id: cache-zotero-bib
Expand Down Expand Up @@ -106,13 +119,17 @@ jobs:
./update_bibliography.sh
sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data
fi
shell: bash

- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.133.1'
extended: true
# Install Hugo Extended
#
- name: Install Hugo CLI
run: |
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb

- name: Setup Pages
id: pages
uses: actions/configure-pages@v5

- name: Setup Node
uses: actions/setup-node@v4
Expand All @@ -124,12 +141,26 @@ jobs:
- run: npm install --verbose

- name: Build
run: hugo -e $hugoEnvironment -d ~/temp/deploy
env:
# HUGO_ENVIRONMENT: staging
HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache
TZ: America/New York
run: hugo -d "./public" --cleanDestinationDir -e staging

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./public

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build

# - name: Deploy
# uses: peaceiris/actions-gh-pages@v4
# if: github.ref == 'refs/heads/main'
# with:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# publish_dir: ./public
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
_site
.sass-cache
.jekyll-metadata
public/
node_modules/
_gen/
.hugo_build.lock
Expand Down
2 changes: 1 addition & 1 deletion config/_default/hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ canonifyURLs: false
# Default to false and set to true for production in config/production/hugo.yaml
enableRobotsTXT: false

# aasetDir: Location where Hugo looks for assets
# assetDir: Location where Hugo looks for assets
assetDir: static

# Enable .GitInfo object for each page. This will give values to .Lastmod etc.
Expand Down
2 changes: 1 addition & 1 deletion config/_default/markup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ goldmark:
# See: https://gohugo.io/getting-started/configuration-markup/#highlight
# for additional information on configuration options.
# https://www.docsy.dev/docs/adding-content/lookandfeel/#code-highlighting-with-chroma
# contains Docsy specfiic code highlighting information
# contains Docsy specfic code highlighting information
highlight:
# See a complete list of available styles at https://xyproto.github.io/splash/docs/all.html
#style: solarized-dark
Expand Down
2 changes: 1 addition & 1 deletion config/_default/params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ github_branch: main
github_subdir:
github_project_repo: https://github.com/interlisp/medley

# Google custom seach engine configuration
# Google custom search engine configuration
# gcs_engine_id: search engine
gcs_engine_id: 33ef4cbe0703b4f3a

Expand Down
2 changes: 1 addition & 1 deletion config/_default/privacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# See: https://gohugo.io/about/hugo-and-gdpr/
#
# googleAnalytics:
# ananymizIP: Enable anonymiation of IP addresses
# ananymizeIP: Enable anonymization of IP addresses
# disable: Set to true to disable googleAnalytics
# respectDoNotTrack: Check for Do Not Track in headers
# useSessionStorage: Store session information in storage and
Expand Down
8 changes: 6 additions & 2 deletions config/staging/hugo.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
baseURL: https://wasm.interlisp.org
baseURL: https://stumbo.github.io/InterlispDraft.github.io/

languageCode: en-us

# title
# Insert Staging Environment onto every page to make clear
# this is not the production site
title: 'Staging Environment'
publishDir: stage