Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions .github/actions/devenv-setup/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
name: Setup devenv
description: Install Nix, Cachix, and devenv
inputs:
GITHUB_TOKEN:
description: "GitHub's GITHUB_TOKEN secret."
required: true

runs:
using: composite
steps:
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
with:
github_access_token: ${{ inputs.GITHUB_TOKEN }}
extra_nix_config: |
keep-env-derivations = true
keep-outputs = true
- name: Restore and save Nix store
uses: nix-community/cache-nix-action@7df957e333c1e5da7721f60227dbba6d06080569 # v7.0.2
with:
# restore and save a cache using this key
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock', 'devenv.lock') }}
# if there's no cache hit, restore a cache by this prefix
restore-prefixes-first-match: nix-${{ runner.os }}-
# collect garbage until the Nix store size (in bytes) is at most this number
# before trying to save a new cache
# 1G = 1073741824
gc-max-store-size-linux: 1G
# do purge caches
purge: true
# purge all versions of the cache
purge-prefixes: nix-${{ runner.os }}-
# created more than this number of seconds ago
purge-created: 0
# or last accessed this duration (ISO 8601 duration format)
# before the start of the `Post Restore and save Nix store` phase
purge-last-accessed: P1DT12H
# except any version with the key that is the same as the `primary-key`
purge-primary-key: never
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
with:
name: devenv
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ name: Deploy to DigitalOcean
on:
push:
branches:
- 'main'
- "main"
paths:
- 'resume/**'
- 'config/resume_data.toml'
- 'config/resume_variants/**'
- 'scripts/generate_resume_data.ts'
- 'src/lib/resume/**'
- 'terraform/**'
- '.github/workflows/deploy.yml'
- "resume/**"
- "config/resume_data.toml"
- "config/resume_variants/**"
- "scripts/generate_resume_data.ts"
- "src/lib/resume/**"
- "terraform/**"
- ".github/workflows/deploy.yml"
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
shell: devenv-ci {0}
Expand All @@ -31,6 +31,8 @@ jobs:
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}

- uses: ./.github/actions/devenv-setup
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
66 changes: 0 additions & 66 deletions .github/workflows/playwright.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Run Tests
on:
push:
branches:
- 'main'
- "main"
pull_request:
branches:
- 'main'
- "main"

jobs:
test-vitest:
timeout-minutes: 60
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
shell: devenv-ci {0}
Expand All @@ -27,6 +27,8 @@ jobs:
export-environment-variables: CACHIX_AUTH_TOKEN

- uses: ./.github/actions/devenv-setup
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Node.js dependencies
run: pnpm install --frozen-lockfile
Expand Down
40 changes: 20 additions & 20 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"useTabs": true,
"singleQuote": true,
"trailingComma": "none",
"printWidth": 100,
"plugins": [
"prettier-plugin-svelte",
"@trivago/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
],
"importOrder": ["<THIRD_PARTY_MODULES>", "^[$](.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"overrides": [
{
"files": "*.svelte",
"options": {
"parser": "svelte"
}
}
]
"useTabs": false,
"singleQuote": false,
"trailingComma": "none",
"printWidth": 100,
"plugins": [
"prettier-plugin-svelte",
"@trivago/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
],
"importOrder": ["<THIRD_PARTY_MODULES>", "^[$](.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"overrides": [
{
"files": "*.svelte",
"options": {
"parser": "svelte"
}
}
]
}
12 changes: 6 additions & 6 deletions devenv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1783538213,
"narHash": "sha256-jNjKlmrejUrBgVAeiavlMLlkmC7ZEv1D9nhfuwMW5Q8=",
"lastModified": 1784650273,
"narHash": "sha256-H8E5N0N2TtVZa1aBup5xAIj57u5hSKMEegtzGJlMU0s=",
"owner": "cachix",
"repo": "devenv",
"rev": "d1fb321e73048d0e1e2b523580268ebb3df2ae90",
"rev": "8dc0eea065722488f5e127dbcc0c3f4e40bdbb2d",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1783008725,
"narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=",
"lastModified": 1784288435,
"narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe",
"rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
"type": "github"
},
"original": {
Expand Down
2 changes: 0 additions & 2 deletions devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ in {
entr
git
gnumake
playwright
playwright-test
pulumi-bin
tree
# keep-sorted end
Expand Down
86 changes: 0 additions & 86 deletions e2e/home.spec.ts

This file was deleted.

Loading