Skip to content

Commit b4beccb

Browse files
spietrasspietras
authored
Fetched template changes (#36)
1 parent ff431d7 commit b4beccb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6107
-3789
lines changed

‎.copier-answers.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 0.10.0
2+
_commit: 0.11.0
33
_src_path: gh:quickplates/meta
44
accountname: quickplates
55
description: Generic project template 👤

‎.devcontainer/devcontainer.json‎

Lines changed: 102 additions & 231 deletions
Large diffs are not rendered by default.

‎.devcontainer/image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# It also has git, zsh and a bunch of other stuff preinstalled
44
# Also, it includes a non-root 'vscode' user with sudo access
55
# The version is pinned to ensure reproducibility
6-
FROM mcr.microsoft.com/devcontainers/base:1.2.3-ubuntu-24.04
6+
FROM mcr.microsoft.com/devcontainers/base:1.2.6-ubuntu-24.04
77

88
ENV REMOTE_USER=vscode
99

‎.devcontainer/image/setup.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,16 @@ EOF
5858
cat <<EOF >>"${REMOTE_USER_HOME}/.zshrc"
5959
export TRUNK_CACHE=/cache/trunk/
6060
EOF
61+
62+
# Setup npm cache
63+
mkdir --parents /cache/npm/
64+
65+
chown --recursive "${REMOTE_USER}:" /cache/npm/
66+
67+
cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
68+
export NPM_CONFIG_CACHE=/cache/npm/
69+
EOF
70+
71+
cat <<EOF >>"${REMOTE_USER_HOME}/.zshrc"
72+
export NPM_CONFIG_CACHE=/cache/npm/
73+
EOF

‎.github/workflows/example.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ jobs:
3737
contents: read
3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v4.2.2
40+
uses: actions/checkout@v5.0.0
4141
- name: Setup Nix cache
42-
uses: actions/cache@v4.2.1
42+
uses: actions/cache@v4.3.0
4343
id: cache-nix
4444
with:
4545
path: ${{ env.NIX_CACHE_DIR }}
4646
key: example-nix
4747
- name: Install Nix
48-
uses: cachix/install-nix-action@v30
48+
uses: cachix/install-nix-action@v31.8.4
4949
with:
5050
github_access_token: ${{ github.token }}
51-
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
51+
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
5252
# See: https://github.com/cachix/install-nix-action/issues/56
5353
- name: Import Nix store cache
5454
if: steps.cache-nix.outputs.cache-hit == 'true'
55-
run: >
55+
run: >-
5656
nix-store
5757
--import
5858
< ${{ env.NIX_CACHE_DIR }}/archive.nar
5959
- name: Build template files
60-
run: >
60+
run: >-
6161
nix
6262
develop
6363
./#template
@@ -76,7 +76,7 @@ jobs:
7676
'description=Generic project example 👤'
7777
# Create archive to retain file permissions
7878
- name: Create archive
79-
run: >
79+
run: >-
8080
tar
8181
--directory
8282
build/
@@ -86,15 +86,15 @@ jobs:
8686
archive.tar
8787
./
8888
- name: Upload artifact
89-
uses: actions/upload-artifact@v4.6.0
89+
uses: actions/upload-artifact@v5.0.0
9090
with:
9191
include-hidden-files: true
9292
name: build
9393
path: archive.tar
9494
# See: https://github.com/cachix/install-nix-action/issues/56
9595
- name: Export Nix store cache
9696
if: "!cancelled()"
97-
run: >
97+
run: >-
9898
mkdir
9999
--parents
100100
${{ env.NIX_CACHE_DIR }}
@@ -112,11 +112,11 @@ jobs:
112112
timeout-minutes: 10
113113
steps:
114114
- name: Download artifact
115-
uses: actions/download-artifact@v4.1.8
115+
uses: actions/download-artifact@v6.0.0
116116
with:
117117
name: build
118118
- name: Extract archive
119-
run: >
119+
run: >-
120120
mkdir
121121
--parents
122122
build/
@@ -129,7 +129,7 @@ jobs:
129129
--file
130130
archive.tar
131131
- name: Checkout example repository
132-
uses: actions/checkout@v4.2.2
132+
uses: actions/checkout@v5.0.0
133133
with:
134134
repository: quickplates/generic-example
135135
token: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
@@ -139,7 +139,7 @@ jobs:
139139
# Configure git to use GitHub Actions bot as committer
140140
- name: Configure git
141141
working-directory: example/
142-
run: >
142+
run: >-
143143
git
144144
config
145145
user.name
@@ -151,48 +151,48 @@ jobs:
151151
"41898282+github-actions[bot]@users.noreply.github.com"
152152
- name: Reset example repository to first commit
153153
working-directory: example/
154-
run: >
154+
run: >-
155155
git
156156
reset
157157
--hard
158158
"$(git rev-list --max-parents=0 HEAD)"
159159
- name: Push changes
160160
working-directory: example/
161-
run: >
161+
run: >-
162162
git
163163
push
164164
--force
165165
origin
166166
HEAD
167167
- name: Create new branch
168168
working-directory: example/
169-
run: >
169+
run: >-
170170
git
171171
checkout
172172
-b
173173
build
174174
- name: Copy build output
175-
run: >
175+
run: >-
176176
cp
177177
--recursive
178178
build/.
179179
example/
180180
- name: Add changes
181181
working-directory: example/
182-
run: >
182+
run: >-
183183
git
184184
add
185185
./
186186
- name: Commit changes
187187
working-directory: example/
188-
run: >
188+
run: >-
189189
git
190190
commit
191191
--message
192192
'Added template files'
193193
- name: Push changes
194194
working-directory: example/
195-
run: >
195+
run: >-
196196
git
197197
push
198198
--force
@@ -202,7 +202,7 @@ jobs:
202202
working-directory: example/
203203
env:
204204
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
205-
run: >
205+
run: >-
206206
gh
207207
pr
208208
create
@@ -224,7 +224,7 @@ jobs:
224224
working-directory: example/
225225
env:
226226
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
227-
run: >
227+
run: >-
228228
gh
229229
release
230230
list
@@ -252,7 +252,7 @@ jobs:
252252
working-directory: example/
253253
env:
254254
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
255-
run: >
255+
run: >-
256256
gh
257257
pr
258258
merge
@@ -261,7 +261,7 @@ jobs:
261261
--squash
262262
- name: Fetch changes from origin
263263
working-directory: example/
264-
run: >
264+
run: >-
265265
git
266266
fetch
267267
--prune
@@ -271,7 +271,7 @@ jobs:
271271
working-directory: example/
272272
env:
273273
GITHUB_TOKEN: ${{ secrets.EXAMPLES_ACCESS_TOKEN }}
274-
run: >
274+
run: >-
275275
gh
276276
release
277277
create

‎.github/workflows/lint.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,35 @@ jobs:
2828
contents: read
2929
steps:
3030
- name: Checkout code
31-
uses: actions/checkout@v4.2.2
31+
uses: actions/checkout@v5.0.0
3232
# We need to fetch upstream so Trunk can compare against it
3333
- name: Fetch upstream
3434
if: github.event_name == 'pull_request'
35-
run: >
35+
run: >-
3636
git
3737
fetch
3838
origin
3939
${{ github.event.pull_request.base.ref }}
4040
- name: Setup Nix cache
41-
uses: actions/cache@v4.2.1
41+
uses: actions/cache@v4.3.0
4242
id: cache-nix
4343
with:
4444
path: ${{ env.NIX_CACHE_DIR }}
4545
key: lint-nix
4646
- name: Setup Trunk cache
47-
uses: actions/cache@v4.2.1
47+
uses: actions/cache@v4.3.0
4848
with:
4949
path: ${{ env.TRUNK_CACHE_DIR }}
5050
key: lint-trunk
5151
- name: Install Nix
52-
uses: cachix/install-nix-action@v30
52+
uses: cachix/install-nix-action@v31.8.4
5353
with:
5454
github_access_token: ${{ github.token }}
55-
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
55+
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
5656
# See: https://github.com/cachix/install-nix-action/issues/56
5757
- name: Import Nix store cache
5858
if: steps.cache-nix.outputs.cache-hit == 'true'
59-
run: >
59+
run: >-
6060
nix-store
6161
--import
6262
< ${{ env.NIX_CACHE_DIR }}/archive.nar
@@ -65,7 +65,7 @@ jobs:
6565
if: github.event_name == 'pull_request'
6666
env:
6767
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
68-
run: >
68+
run: >-
6969
nix
7070
develop
7171
./#lint
@@ -82,7 +82,7 @@ jobs:
8282
if: github.event_name != 'pull_request'
8383
env:
8484
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
85-
run: >
85+
run: >-
8686
nix
8787
develop
8888
./#lint
@@ -95,7 +95,7 @@ jobs:
9595
# See: https://github.com/cachix/install-nix-action/issues/56
9696
- name: Export Nix store cache
9797
if: "!cancelled()"
98-
run: >
98+
run: >-
9999
mkdir
100100
--parents
101101
${{ env.NIX_CACHE_DIR }}

‎.github/workflows/test.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,34 +46,34 @@ jobs:
4646
contents: read
4747
steps:
4848
- name: Checkout code
49-
uses: actions/checkout@v4.2.2
49+
uses: actions/checkout@v5.0.0
5050
- name: Setup Nix cache
51-
uses: actions/cache@v4.2.1
51+
uses: actions/cache@v4.3.0
5252
id: cache-nix
5353
with:
5454
path: ${{ env.NIX_CACHE_DIR }}
5555
key: test-nix
5656
- name: Setup Trunk cache
57-
uses: actions/cache@v4.2.1
57+
uses: actions/cache@v4.3.0
5858
with:
5959
path: ${{ env.TRUNK_CACHE_DIR }}
6060
key: test-trunk
6161
- name: Install Nix
62-
uses: cachix/install-nix-action@v30
62+
uses: cachix/install-nix-action@v31.8.4
6363
with:
6464
github_access_token: ${{ github.token }}
65-
install_url: https://releases.nixos.org/nix/nix-2.26.2/install
65+
install_url: https://releases.nixos.org/nix/nix-2.28.5/install
6666
# See: https://github.com/cachix/install-nix-action/issues/56
6767
- name: Import Nix store cache
6868
if: steps.cache-nix.outputs.cache-hit == 'true'
69-
run: >
69+
run: >-
7070
nix-store
7171
--import
7272
< ${{ env.NIX_CACHE_DIR }}/archive.nar
7373
- name: Run tests
7474
env:
7575
TRUNK_CACHE: ${{ env.TRUNK_CACHE_DIR }}
76-
run: >
76+
run: >-
7777
nix
7878
develop
7979
./#test
@@ -84,7 +84,7 @@ jobs:
8484
# See: https://github.com/cachix/install-nix-action/issues/56
8585
- name: Export Nix store cache
8686
if: "!cancelled()"
87-
run: >
87+
run: >-
8888
mkdir
8989
--parents
9090
${{ env.NIX_CACHE_DIR }}

‎.trunk/configs/.markdownlint.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ MD033: false
99

1010
# Allow not using top level header
1111
MD041: false
12+
13+
# Allow non-descriptive link text
14+
MD059: false

‎.trunk/configs/.prettierrc.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins:
2+
# Enable JSON sorting plugin
3+
- prettier-plugin-sort-json
4+
5+
# Sort JSON recursively
6+
jsonRecursiveSort: true

0 commit comments

Comments
 (0)