Skip to content

Commit 7738082

Browse files
offbyoneoffbyone
authored
Merge pull request #151 from offbyone/o1-push-vkqozzkppqys
2 parents 0f22c0d + ac2866a commit 7738082

File tree

9 files changed

+238
-99
lines changed

9 files changed

+238
-99
lines changed

‎.github/workflows/main.yml‎

Lines changed: 107 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,136 @@ name: "Blog"
44
on:
55
push:
66
branches:
7-
- master
87
- main
8+
- ci-testing*
9+
10+
pull_request:
11+
branches:
12+
- main
13+
- ci-testing*
914

1015
jobs:
11-
deploy:
12-
# These permissions are needed to interact with GitHub's OIDC Token endpoint.
16+
build:
1317
permissions:
14-
id-token: write
1518
contents: read
16-
1719
runs-on: ubuntu-latest
1820

1921
steps:
2022
- uses: actions/checkout@v4
21-
- uses: extractions/setup-just@v1
22-
23-
- name: Configure AWS Credentials
24-
uses: aws-actions/configure-aws-credentials@v2
2523
with:
26-
aws-region: us-west-2
27-
role-to-assume: arn:aws:iam::984616268605:role/ideas-deployer
28-
role-session-name: deploy-ideas
29-
mask-aws-account-id: false
24+
persist-credentials: false
3025

31-
- name: Set up uv
32-
run: |
33-
curl -LsSf https://astral.sh/uv/0.4.22/install.sh | sh
34-
- name: Set up Python
35-
run: |
36-
uv python install --python-preference=system
37-
38-
- name: install python libs
39-
run: uv sync
40-
41-
- name: Set up Node
42-
uses: actions/setup-node@v3
26+
- name: Install just
27+
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
28+
- name: Install uv
29+
uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v6.4.1
30+
- name: Install node
31+
uses: actions/setup-node@v4.4.0
4332
with:
44-
node-version: "18"
45-
33+
node-version-file: .tool-versions
34+
cache: npm
4635
- name: Install dependencies
47-
run: |
48-
npm install
49-
echo "$GITHUB_WORKSPACE/node_modules/.bin" >> "$GITHUB_PATH"
36+
run: just setup-gha
5037

5138
- name: Assert that our dependencies are reachable
5239
run: |
5340
uv run python --version
5441
uv run pelican --version
5542
sass --version
56-
just --version
5743
5844
- name: Build the page
5945
run: |
6046
just generate
6147
48+
- name: Upload build artifact
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: site-build
52+
path: output/
53+
retention-days: 1
54+
55+
verify:
56+
needs: build
57+
runs-on: ubuntu-latest
58+
permissions:
59+
contents: read
60+
strategy:
61+
matrix:
62+
check:
63+
- check-links
64+
- check-html
65+
- check-code
66+
- check-content
67+
- check-feeds
68+
steps:
69+
- uses: actions/checkout@v4
70+
with:
71+
persist-credentials: false
72+
- name: Install just
73+
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
74+
- name: Install uv
75+
uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v6.4.1
76+
- name: Install node
77+
uses: actions/setup-node@v4.4.0
78+
with:
79+
node-version-file: .tool-versions
80+
cache: npm
81+
- name: Install dependencies
82+
run: just setup-gha
83+
- name: Download build artifact
84+
uses: actions/download-artifact@v4
85+
with:
86+
name: site-build
87+
path: output/
88+
89+
- name: Run verification checks
90+
run: just ${{ matrix.check }}
91+
92+
deploy:
93+
# I am not blocking this on verify because I want the ability to publish
94+
# quick trash.
95+
needs: build
96+
# only run this when the action is push and the destination branch is main
97+
if: github.action == 'push' && github.ref_name == 'main'
98+
permissions:
99+
id-token: write
100+
contents: read
101+
runs-on: ubuntu-latest
102+
103+
steps:
104+
- uses: actions/checkout@v4
105+
with:
106+
persist-credentials: false
107+
sparse-checkout: |
108+
justfile
109+
sparse-checkout-cone-mode: false
110+
111+
- name: Install just
112+
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
113+
- name: Install uv
114+
uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v6.4.1
115+
- name: Install node
116+
uses: actions/setup-node@v4.4.0
117+
with:
118+
node-version-file: .tool-versions
119+
cache: npm
120+
- name: Install dependencies
121+
run: just setup-gha
122+
123+
- name: Configure AWS Credentials
124+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
125+
with:
126+
aws-region: us-west-2
127+
role-to-assume: arn:aws:iam::984616268605:role/ideas-deployer
128+
role-session-name: deploy-ideas
129+
mask-aws-account-id: false
130+
131+
- name: Download build artifact
132+
uses: actions/download-artifact@v4
133+
with:
134+
name: site-build
135+
path: output/
136+
62137
- name: Publish the content
63138
run: |
64139
just upload
@@ -69,7 +144,7 @@ jobs:
69144
70145
- name: Tell me about it
71146
if: ${{ always() }}
72-
uses: desiderati/github-action-pushover@v1
147+
uses: desiderati/github-action-pushover@22efda5223198aba3e271f9cbec9b1b3a16033b0 # v1
73148
with:
74149
job-status: ${{ job.status }}
75150
pushover-api-token: ${{ secrets.PUSHOVER_API_TOKEN }}

‎.github/workflows/pr.yml‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,19 @@ on:
1111
- main
1212

1313
jobs:
14-
verify:
14+
zizmor:
15+
name: Zizmor
1516
runs-on: ubuntu-latest
16-
17+
permissions:
18+
contents: read # only needed for private repos
19+
actions: read # only needed for private repos
1720
steps:
18-
- uses: actions/checkout@v4
19-
- uses: extractions/setup-just@v1
20-
- name: Set up uv
21-
run: |
22-
curl -LsSf https://astral.sh/uv/0.4.22/install.sh | sh
23-
- name: Set up Python
24-
run: |
25-
uv python install --python-preference=system
26-
27-
- name: install python libs
28-
run: uv sync
29-
30-
- name: Set up Node
31-
uses: actions/setup-node@v3
21+
- name: Checkout repository
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3223
with:
33-
node-version: "18"
24+
persist-credentials: false
3425

35-
- name: Install dependencies
36-
run: |
37-
npm install
38-
echo "$GITHUB_WORKSPACE/node_modules/.bin" >> "$GITHUB_PATH"
39-
40-
- name: Build the page
41-
run: |
42-
just generate
26+
- name: Run zizmor 🌈
27+
uses: zizmorcore/zizmor-action@f52a838cfabf134edcbaa7c8b3677dde20045018 # v0.1.1
28+
with:
29+
advanced-security: false

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ themes/offby1/static/webfonts/
1717

1818
**/.claude/settings.local.json
1919
plan.just
20+
!.tool-versions

‎.pinact.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/suzuki-shunsuke/pinact/refs/heads/main/json-schema/pinact.json
2+
# pinact - https://github.com/suzuki-shunsuke/pinact
3+
version: 3
4+
# files:
5+
# - pattern: action.yaml
6+
# - pattern: */action.yaml
7+
8+
ignore_actions:
9+
# - name: slsa-framework/slsa-github-generator/\.github/workflows/generator_generic_slsa3\.yml
10+
# ref: v\d+\.\d+\.\d+
11+
- name: actions/.*
12+
ref: v.*
13+
# - name: suzuki-shunsuke/.*
14+
# ref: release-.*

‎.tool-versions‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python 3.11
2+
terraform 1.7.0
3+
nodejs 22

‎content/old/general-thoughts/privacy-what-privacy.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ provoked (and prodded... and
1515
...) <http://rfjason.livejournal.com/410835.html>`__ by a blogger by the
1616
name of Jason Fortuny.
1717

18-
Fortuny, looking at `Craigslist <www.craigslist.org>`__, observed this,
18+
Fortuny, looking at `Craigslist <https://www.craigslist.org>`__, observed this,
1919
and made a decision that is -- at best -- unethical, and at worst
2020
actively sociopathic. He posted an explicit ad to a casual encounters
2121
section of a Craigslist site (a section devoted to hooking up for

‎content/old/humour/geek-poetry.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Title: Geek Poetry
2+
Date: 2003-10-08 07:33
3+
Author: offby1
4+
Category: Humour
5+
Tags: humour
6+
Slug: geek-poetry
7+
Status: draft
8+
9+
If you can read these without help, may the gods of geekdom have mercy
10+
on your soul. If you can't, read the extended entry for help :)
11+
12+
```
13+
1)
14+
15+
!\*''#
16+
^"\`$$-
17+
!\*=@$\_
18+
%\* ~#4
19+
&[]../
20+
\|{,,SYSTEM HALTED
21+
22+
2)
23+
24+
^< @
25+
;\`+$?^?
26+
,#"~\|)^G
27+
```
28+
29+
1)
30+
> Waka waka bang splat tick tick hash,
31+
> Caret quote back-tick dollar dollar dash,
32+
> Bang splat equal at dollar under-score,
33+
> Percent splat waka waka tilde number four,
34+
> Ampersand bracket bracket dot dot slash,
35+
> Vertical-bar curly-bracket comma comma CRASH.
36+
37+
2)
38+
> hat less at less point at star
39+
> backbrace double base pound space bar
40+
> dash at cash and slash base rate
41+
> wow open tab at bar is great
42+
> semi backquote plus cash huh DEL
43+
> comma pound double tilde bar close BEL

‎content/old/humour/geek-poetry.rst‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)