Skip to content

Commit 9583242

Browse files
committed
dev: some dependency and CI fixes
- add a debug build task - dependabot configuration with cooldown - python 3.14 min version (which I'd been using anyway) - use the mise action instead of setup-node - switch to opentofu for builds
1 parent 79e7fcb commit 9583242

File tree

8 files changed

+70
-42
lines changed

8 files changed

+70
-42
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ updates:
1616
- "*"
1717
exclude-patterns:
1818
- "pelican*"
19+
cooldown:
20+
default-days: 7
1921
- package-ecosystem: "npm"
2022
directory: "/"
2123
schedule:
@@ -26,3 +28,5 @@ updates:
2628
dependecies:
2729
patterns:
2830
- "*"
31+
cooldown:
32+
default-days: 7

.github/workflows/main.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ jobs:
2727
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
2828
- name: Install uv
2929
uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v6.4.1
30-
- name: Install node
31-
uses: actions/setup-node@v4.4.0
32-
with:
33-
node-version-file: .tool-versions
34-
cache: npm
30+
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
3531
- name: Install dependencies
3632
run: just setup-gha
3733

@@ -73,11 +69,7 @@ jobs:
7369
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
7470
- name: Install uv
7571
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
72+
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
8173
- name: Install dependencies
8274
run: just setup-gha
8375
- name: Download build artifact

.terraform.lock.hcl

Lines changed: 13 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

justfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ prepare_fonts:
2727
build settings="pelicanconf.py": prepare_fonts
2828
uv run pelican --fatal=errors -s {{settings}} -o output content
2929

30+
debug settings="pelicanconf.py": prepare_fonts
31+
uv run pelican --fatal=errors -s {{settings}} -o output content --debug
32+
3033
generate: (build "publishconf.py")
3134

3235
generate-dev: build
@@ -59,10 +62,10 @@ setup-gha: install-deps
5962
deps: compile-deps install-deps
6063

6164
plan:
62-
terraform plan -out plan.just
65+
tofu plan -out plan.just
6366

6467
apply:
65-
terraform apply plan.just
68+
tofu apply plan.just
6669

6770
new_post:
6871
uv run invoke new-post

mise.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[tools]
22
node = "22"
3-
python = "3.11"
4-
terraform = "latest"
3+
opentofu = "1.10.7"

pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[project]
22
name = "offby1.website"
33
description = "My website"
4-
requires-python = "~= 3.13"
4+
# Pillow doesn't work with 3.14 on CI yet
5+
requires-python = ">= 3.13, < 3.14"
56
keywords = [
67
"pelican",
78
"blog",
@@ -38,6 +39,7 @@ dependencies = [
3839
"boto3~=1.35",
3940
"click~=8.1",
4041
"aws-log-parser~=2.4",
42+
"pelican-myst-reader>=1.4.0",
4143
]
4244

4345
[tool.uv]

setup.tf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ resource "aws_s3_bucket_acl" "blog" {
7575
bucket = aws_s3_bucket.blog.id
7676
access_control_policy {
7777
owner {
78-
id = data.aws_canonical_user_id.current.id
79-
display_name = "offline"
78+
id = data.aws_canonical_user_id.current.id
8079
}
8180
}
8281
}
@@ -225,8 +224,7 @@ resource "aws_s3_bucket_acl" "wwwblog" {
225224
}
226225

227226
owner {
228-
id = data.aws_canonical_user_id.current.id
229-
display_name = "offline"
227+
id = data.aws_canonical_user_id.current.id
230228
}
231229
}
232230
}

uv.lock

Lines changed: 40 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)