Merge branch 'main' into drafts

This commit is contained in:
John Bowdre 2024-01-21 14:41:37 -06:00
commit fb5eea829c
7 changed files with 51 additions and 50 deletions

View file

@ -1,4 +1,4 @@
name: Deploy to neocities name: Deploy to Neocities
# only run on changes to main # only run on changes to main
on: on:
@ -16,7 +16,8 @@ defaults:
shell: bash shell: bash
jobs: jobs:
deploy: build:
name: Build Hugo site
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
HUGO_VERSION: "0.121.1" HUGO_VERSION: "0.121.1"
@ -40,12 +41,54 @@ jobs:
HUGO_ENV: production HUGO_ENV: production
run: | run: |
hugo \ hugo \
--minify \ --minify
--baseURL "https://runtimeterror.dev/" - name: Insert 404 page
run: |
cp public/not_found/index.html public/not_found.html
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: build
path: public
retention-days: 1
highlight:
name: Highlight code with Torchlight
runs-on: ubuntu-latest
needs: build
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Node.js dependencies
run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: build
path: public
- name: Highlight with Torchlight - name: Highlight with Torchlight
run: | run: |
npm i @torchlight-api/torchlight-cli npm i @torchlight-api/torchlight-cli
npx torchlight npx torchlight
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: highlight
path: public
retention-days: 1
deploy:
name: Publish to Neocities
runs-on: ubuntu-latest
needs: highlight
steps:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: highlight
path: public
- name: Deploy to neocities - name: Deploy to neocities
uses: bcomnes/deploy-to-neocities@v1 uses: bcomnes/deploy-to-neocities@v1
with: with:

View file

@ -1 +1 @@
[![Netlify Status](https://api.netlify.com/api/v1/badges/7cd6b595-2b3b-403d-a29f-c4f27e8bd366/deploy-status)](https://app.netlify.com/sites/runtimeterrordev/deploys) [![Neocities Deployment Status](https://github.com/jbowdre/runtimeterror/actions/workflows/deploy-to-neocities.yml/badge.svg)](https://github.com/jbowdre/runtimeterror/actions/workflows/deploy-to-neocities.yml)

View file

@ -1,2 +1,2 @@
comments = true comments = false
analytics = false analytics = false

View file

@ -1 +0,0 @@
baseURL = "https://preview--runtimeterrordev.netlify.app"

View file

@ -1,2 +0,0 @@
comments = false
analytics = false

View file

@ -97,6 +97,7 @@ resources:
And I will add in a `storage` property as well which will automatically adjust the deployed VMDK size to match the specified input: And I will add in a `storage` property as well which will automatically adjust the deployed VMDK size to match the specified input:
```yaml ```yaml
# torchlight! {"torchlightAnnotations": false}
# torchlight! {"lineNumbers": true} # torchlight! {"lineNumbers": true}
[...] [...]
description: '${input.description}' description: '${input.description}'
@ -202,7 +203,6 @@ inputs:
type: string type: string
title: Point of Contact Email title: Point of Contact Email
default: jack.shephard@example.com default: jack.shephard@example.com
pattern: '^[^\s@]+@[^\s@]+\.[^\s@]+$'
ticket: ticket:
type: string type: string
title: Ticket/Request Number title: Ticket/Request Number
@ -292,7 +292,7 @@ Once all those constants are created I can move on to the meat of this little pr
#### ABX Action #### ABX Action
I'll click back to **Extensibility > Library > Actions** and then **+ New Action**. I give the new action a clever title and description: I'll click back to **Extensibility > Library > Actions** and then **+ New Action**. I give the new action a clever title and description:
![Create a new action](20210901_create_action.png)] ![Create a new action](20210901_create_action.png)
I then hit the language dropdown near the top left and select to use `powershell` so that I can use those sweet, sweet PowerCLI cmdlets. I then hit the language dropdown near the top left and select to use `powershell` so that I can use those sweet, sweet PowerCLI cmdlets.
![Language selection](20210901_action_select_language.png) ![Language selection](20210901_action_select_language.png)

View file

@ -1,39 +0,0 @@
[build]
publish = "public"
[build.environment]
HUGO_VERSION = "0.121.1"
[context.production]
command = """
hugo
npm i @torchlight-api/torchlight-cli
npx torchlight
"""
[context.preview]
command = """
hugo --environment preview
npm i @torchlight-api/torchlight-cli
npx torchlight
"""
[[headers]]
for = "/*"
[headers.values]
X-Robots-Tag = "noindex"
[context.drafts]
command = """
hugo --environment drafts -D
npm i @torchlight-api/torchlight-cli
npx torchlight
"""
[[headers]]
for = "/*"
[headers.values]
X-Robots-Tag = "noindex"
[[redirects]]
from = "/*"
to = "/404/"
status = 404