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
2 changes: 1 addition & 1 deletion .copier-answers.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 0.10.0
_commit: 0.11.0
_src_path: gh:quickplates/meta
accountname: quickplates
description: Next.js app template ⚫
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
},
"ghcr.io/devcontainers/features/nix:1.2.0": {
"extraNixConfig": "experimental-features = nix-command flakes",
"version": "2.32.4"
"version": "2.28.5"
}
},
"mounts": [
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ jobs:
uses: cachix/install-nix-action@v31.8.4
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.32.4/install
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
run: >
run: >-
nix-store
--import
< ${{ env.NIX_CACHE_DIR }}/archive.nar
- name: Build template files
run: >
run: >-
nix
develop
./#template
Expand All @@ -76,7 +76,7 @@ jobs:
'description=Next.js app example ⚫'
# Create archive to retain file permissions
- name: Create archive
run: >
run: >-
tar
--directory
build/
Expand All @@ -94,7 +94,7 @@ jobs:
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Export Nix store cache
if: "!cancelled()"
run: >
run: >-
mkdir
--parents
${{ env.NIX_CACHE_DIR }}
Expand All @@ -116,7 +116,7 @@ jobs:
with:
name: build
- name: Extract archive
run: >
run: >-
mkdir
--parents
build/
Expand All @@ -139,7 +139,7 @@ jobs:
# Configure git to use GitHub Actions bot as committer
- name: Configure git
working-directory: example/
run: >
run: >-
git
config
user.name
Expand All @@ -151,48 +151,48 @@ jobs:
"41898282+github-actions[bot]@users.noreply.github.com"
- name: Reset example repository to first commit
working-directory: example/
run: >
run: >-
git
reset
--hard
"$(git rev-list --max-parents=0 HEAD)"
- name: Push changes
working-directory: example/
run: >
run: >-
git
push
--force
origin
HEAD
- name: Create new branch
working-directory: example/
run: >
run: >-
git
checkout
-b
build
- name: Copy build output
run: >
run: >-
cp
--recursive
build/.
example/
- name: Add changes
working-directory: example/
run: >
run: >-
git
add
./
- name: Commit changes
working-directory: example/
run: >
run: >-
git
commit
--message
'Added template files'
- name: Push changes
working-directory: example/
run: >
run: >-
git
push
--force
Expand All @@ -202,7 +202,7 @@ jobs:
working-directory: example/
env:
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
run: >
run: >-
gh
pr
create
Expand All @@ -224,7 +224,7 @@ jobs:
working-directory: example/
env:
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
run: >
run: >-
gh
release
list
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
working-directory: example/
env:
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
run: >
run: >-
gh
pr
merge
Expand All @@ -261,7 +261,7 @@ jobs:
--squash
- name: Fetch changes from origin
working-directory: example/
run: >
run: >-
git
fetch
--prune
Expand All @@ -271,7 +271,7 @@ jobs:
working-directory: example/
env:
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
run: >
run: >-
gh
release
create
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# We need to fetch upstream so Trunk can compare against it
- name: Fetch upstream
if: github.event_name == 'pull_request'
run: >
run: >-
git
fetch
origin
Expand All @@ -52,11 +52,11 @@ jobs:
uses: cachix/install-nix-action@v31.8.4
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.32.4/install
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
run: >
run: >-
nix-store
--import
< ${{ env.NIX_CACHE_DIR }}/archive.nar
Expand All @@ -65,7 +65,7 @@ jobs:
if: github.event_name == 'pull_request'
env:
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
run: >
run: >-
nix
develop
./#lint
Expand All @@ -82,7 +82,7 @@ jobs:
if: github.event_name != 'pull_request'
env:
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
run: >
run: >-
nix
develop
./#lint
Expand All @@ -95,7 +95,7 @@ jobs:
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Export Nix store cache
if: "!cancelled()"
run: >
run: >-
mkdir
--parents
${{ env.NIX_CACHE_DIR }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,18 @@ jobs:
uses: cachix/install-nix-action@v31.8.4
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.32.4/install
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
run: >
run: >-
nix-store
--import
< ${{ env.NIX_CACHE_DIR }}/archive.nar
- name: Run tests
env:
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
run: >
run: >-
nix
develop
./#test
Expand All @@ -84,7 +84,7 @@ jobs:
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Export Nix store cache
if: "!cancelled()"
run: >
run: >-
mkdir
--parents
${{ env.NIX_CACHE_DIR }}
Expand Down
3 changes: 3 additions & 0 deletions .trunk/configs/ruff.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Python version to target
target-version = "py313"

select = [
# Enable all rules
"ALL",
Expand Down
26 changes: 13 additions & 13 deletions Taskfile.dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tasks:
GIT_CONFIG_GLOBAL: ""
GIT_CONFIG_SYSTEM: ""
cmds:
- >
- >-
copier
update
--answers-file
Expand All @@ -17,7 +17,7 @@ tasks:
flake:
desc: Update flake.lock
cmds:
- >
- >-
nix
--accept-flake-config
--extra-experimental-features
Expand All @@ -29,28 +29,28 @@ tasks:
fmt:
desc: Format files
cmds:
- >
- >-
trunk
fmt
{{ .CLI_ARGS }}
lint:
desc: Lint files
cmds:
- >
- >-
trunk
check
{{ .CLI_ARGS }}
clean:
desc: Clean build outputs
cmds:
- >
- >-
rm
--recursive
--force
{{ .CLI_ARGS }}
build/
status:
- >
- >-
test
'!'
-d
Expand Down Expand Up @@ -78,7 +78,7 @@ tasks:
- task: clean
vars:
CLI_ARGS: ""
- >
- >-
copier
copy
--overwrite
Expand All @@ -100,21 +100,21 @@ tasks:
GIT_COMMITTER_EMAIL: test@example.org
dir: build/
cmds:
- >
- >-
git
init
--initial-branch
main
--quiet
- >
- >-
git
commit
--allow-empty
--message
'Initial commit'
--quiet
status:
- >
- >-
test
-d
.git/
Expand All @@ -126,13 +126,13 @@ tasks:
GIT_CONFIG_SYSTEM: ""
dir: build/
cmds:
- >
- >-
git
add
--all
{{ .CLI_ARGS }}
status:
- >
- >-
test
-z
"$(git ls-files --others --exclude-standard)"
Expand All @@ -158,7 +158,7 @@ tasks:
test:
desc: Test the project
cmds:
- >
- >-
pytest
tests/
{{ .CLI_ARGS }}
2 changes: 1 addition & 1 deletion copier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

accountname:
type: str
help: The name of the organization on GitHub
help: The name of the account on GitHub

appname:
type: str
Expand Down
Loading