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.8.0
_commit: 0.9.0
_src_path: gh:quickplates/meta
accountname: quickplates
description: Helm charts template ⛵
Expand Down
10 changes: 5 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,15 @@
"ghcr.io/devcontainers/features/nix:1.2.0": {
// Enable experimental features
"extraNixConfig": "experimental-features = nix-command flakes",
"version": "2.20.5"
"version": "2.26.2"
},
// Install Direnv
"ghcr.io/devcontainers-contrib/features/direnv:1.0.2": {
"version": "2.34.0"
"ghcr.io/devcontainers-extra/features/direnv:1.0.2": {
"version": "2.35.0"
},
// Install Starship
"ghcr.io/devcontainers-contrib/features/starship:1.0.9": {
"version": "1.17.1"
"ghcr.io/devcontainers-extra/features/starship:1.0.9": {
"version": "1.22.1"
}
},
// Volumes
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# It also has git, zsh and a bunch of other stuff preinstalled
# Also, it includes a non-root 'vscode' user with sudo access
# The version is pinned to ensure reproducibility
FROM mcr.microsoft.com/devcontainers/base:1.0.22-ubuntu-22.04
FROM mcr.microsoft.com/devcontainers/base:1.2.3-ubuntu-24.04

ENV REMOTE_USER=vscode

Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
build:
name: Build template
# Pin version of Ubuntu to avoid breaking changes
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 10
env:
Expand All @@ -37,18 +37,18 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
- name: Setup Nix cache
uses: actions/cache@v4.0.1
uses: actions/cache@v4.2.1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: example-nix
- name: Install Nix
uses: cachix/install-nix-action@v26
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:
archive.tar
./
- name: Upload artifact
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.6.0
with:
include-hidden-files: true
name: build
path: archive.tar
# See: https://github.com/cachix/install-nix-action/issues/56
Expand All @@ -106,12 +107,12 @@ jobs:
# Run only if build job succeeded
needs: build
# Pin version of Ubuntu to avoid breaking changes
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 10
steps:
- name: Download artifact
uses: actions/[email protected].4
uses: actions/[email protected].8
with:
name: build
- name: Extract archive
Expand All @@ -128,7 +129,7 @@ jobs:
--file
archive.tar
- name: Checkout example repository
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
with:
repository: quickplates/helm-example
token: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
lint:
name: Lint
# Pin version of Ubuntu to avoid breaking changes
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 10
env:
Expand All @@ -28,7 +28,7 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
# We need to fetch upstream so Trunk can compare against it
- name: Fetch upstream
if: github.event_name == 'pull_request'
Expand All @@ -38,21 +38,21 @@ jobs:
origin
${{ github.event.pull_request.base.ref }}
- name: Setup Nix cache
uses: actions/cache@v4.0.1
uses: actions/cache@v4.2.1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: lint-nix
- name: Setup Trunk cache
uses: actions/cache@v4.0.1
uses: actions/cache@v4.2.1
with:
path: ${{ env.TRUNK_CACHE_DIR }}
key: lint-trunk
- name: Install Nix
uses: cachix/install-nix-action@v26
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
test:
name: Test
# Pin version of Ubuntu to avoid breaking changes
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 30
env:
Expand All @@ -46,23 +46,23 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
- name: Setup Nix cache
uses: actions/cache@v4.0.1
uses: actions/cache@v4.2.1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: test-nix
- name: Setup Trunk cache
uses: actions/cache@v4.0.1
uses: actions/cache@v4.2.1
with:
path: ${{ env.TRUNK_CACHE_DIR }}
key: test-trunk
- name: Install Nix
uses: cachix/install-nix-action@v26
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down
1 change: 1 addition & 0 deletions .trunk/configs/.yamllint.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
rules:
line-length:
allow-non-breakable-words: true
allow-non-breakable-inline-mappings: true
37 changes: 23 additions & 14 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
version: 0.1
cli:
version: 1.20.1
version: 1.22.8
plugins:
sources:
- id: trunk
ref: v1.4.4
ref: v1.6.7
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
# Needed for gitleaks, shfmt
- go@1.22.1
- go@1.23.6
# Needed for markdownlint, prettier, svgo
- node@21.7.1
- node@22.14.0
# Needed for black, ruff, yamllint
- python@3.11.6
- python@3.12.2
lint:
ignore:
- linters: [ALL]
Expand Down Expand Up @@ -57,32 +57,41 @@ lint:
check
path:${target}
success_codes: [0, 1]
# Override default Prettier definition
- name: prettier
commands:
- name: format
run: >-
prettier
--no-error-on-unmatched-pattern
--write
${target}
enabled:
# GitHub Actions linting
- actionlint@1.6.27
- actionlint@1.7.7
# Python formatting
- black@24.2.0
- black@25.1.0
# Check for whitespace errors
- git-diff-check
# Check for secrets in the code
- gitleaks@8.18.2
- gitleaks@8.23.3
# Markdown linting
- markdownlint@0.39.0
- markdownlint@0.44.0
# Nix formatting check
- nix-fmt-check@SYSTEM
# Nix flake check
- nix-flake-check@SYSTEM
# JS, JSON, YAML, Markdown formatting
- prettier@3.0.2
- prettier@3.5.1
# Python linting
- ruff@0.3.2
- ruff@0.9.6
# Shell linting
- [email protected]
# Shell formatting
- shfmt@3.8.0
- shfmt@3.10.0
# SVG formatting
- svgo@3.2.0
- svgo@3.3.2
# TOML formatting
- taplo@0.8.1
- taplo@0.9.3
# YAML linting
- [email protected]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT No Attribution

Copyright (c) 2024 quickplates
Copyright (c) 2025 quickplates

Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.dist.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.39"

tasks:
template:
Expand Down
32 changes: 13 additions & 19 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
inputs = {
nixpkgs = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
url = "github:NixOS/nixpkgs/nixos-24.11";
};

flake-parts = {
Expand Down Expand Up @@ -35,7 +35,7 @@
system,
...
}: let
python = pkgs.python311.withPackages (ps: [ps.pytest ps.plumbum]);
python = pkgs.python312.withPackages (ps: [ps.pytest ps.plumbum]);
nil = pkgs.nil;
task = pkgs.go-task;
coreutils = pkgs.coreutils;
Expand Down
2 changes: 1 addition & 1 deletion src/LICENSE.jinja
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT No Attribution

Copyright (c) 2024 {{ accountname }}
Copyright (c) 2025 {{ accountname }}

Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
Expand Down
2 changes: 1 addition & 1 deletion src/Taskfile.dist.yaml.jinja
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.39"

tasks:
template:
Expand Down
Loading