Skip to content

Commit 6a0401f

Browse files
authored
Merge branch 'main' into chore/pnpm-auto-dedupe
2 parents 4d601c6 + 065e099 commit 6a0401f

30 files changed

Lines changed: 1898 additions & 872 deletions

File tree

‎.github/renovate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"minimumReleaseAge": "3 days",
1717
"mode": "full",
1818
"packageRules": [
19+
{
20+
"description": "Keep the working Tirith scanner pinned until workflow analysis is compatible.",
21+
"matchManagers": ["nix"],
22+
"matchDepNames": ["tirith-nixpkgs"],
23+
"enabled": false
24+
},
1925
{
2026
"description": "Keep schemars on the 0.x API until its schema generator is migrated deliberately.",
2127
"matchPackageNames": ["schemars"],
@@ -30,6 +36,7 @@
3036
],
3137
"postUpdateOptions": ["pnpmDedupe"],
3238
"rangeStrategy": "bump",
39+
"rebaseWhen": "conflicted",
3340
"vulnerabilityAlerts": {
3441
"labels": ["security"]
3542
}

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# `pull_request_target`), so fork PRs only ever get a read-only token and
2727
# cannot leak secrets while we scan their code. The downstream jobs `needs`
2828
# this job, so they are skipped unless tirith passes. tirith is installed from
29-
# the flake's pinned nixpkgs so CI matches the dev shell.
29+
# the flake's pinned package so CI matches the dev shell.
3030
tirith-scan:
3131
name: tirith security scan
3232
runs-on: blacksmith-32vcpu-ubuntu-2404
@@ -44,7 +44,7 @@ jobs:
4444
persist-credentials: false
4545
- uses: ./.github/actions/setup-nix-cache
4646
- name: Install tirith
47-
run: nix profile install --inputs-from . nixpkgs#tirith
47+
run: nix profile install .#tirith
4848
# One pass produces the SARIF report and sets the gate exit code. tirith's
4949
# `--ci` exit code is: 0 = no findings, 1 = findings at/above --fail-on,
5050
# 2 = findings present but all below it. We capture it (rather than letting
@@ -123,7 +123,7 @@ jobs:
123123
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
124124
with:
125125
name: tirith-sarif
126-
- uses: github/codeql-action/upload-sarif@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
126+
- uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
127127
with:
128128
sarif_file: results.sarif
129129
category: tirith

‎.github/workflows/issue-gate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
id: judge
8787
if: steps.access.outcome == 'success' && (steps.access.outputs.skip != 'true' || inputs.force_implementation == true)
8888
continue-on-error: true
89-
uses: pullfrog/pullfrog@ce127b38d7f0c6c5e2c40ccd290adc4c5652357f # v0.1.82
89+
uses: pullfrog/pullfrog@99c5e781dd54463197d1109998386d37c84f6853 # v0.1.84
9090
with:
9191
prompt: ${{ steps.request.outputs.prompt }}
9292
timeout: 15m
@@ -239,7 +239,7 @@ jobs:
239239
- name: Ask Pullfrog to implement the issue
240240
id: pullfrog
241241
if: steps.implementation_guard.outputs.skip != 'true'
242-
uses: pullfrog/pullfrog@ce127b38d7f0c6c5e2c40ccd290adc4c5652357f # v0.1.82
242+
uses: pullfrog/pullfrog@99c5e781dd54463197d1109998386d37c84f6853 # v0.1.84
243243
with:
244244
prompt: ${{ needs.apply.outputs.prompt }}
245245
timeout: 1h

‎.github/workflows/pr-gate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps.access.outputs.skip != 'true' &&
6868
steps.access.outputs.bypass != 'true'
6969
continue-on-error: true
70-
uses: pullfrog/pullfrog@ce127b38d7f0c6c5e2c40ccd290adc4c5652357f # v0.1.82
70+
uses: pullfrog/pullfrog@99c5e781dd54463197d1109998386d37c84f6853 # v0.1.84
7171
with:
7272
prompt: ${{ steps.request.outputs.prompt }}
7373
timeout: 15m

‎.github/workflows/pullfrog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Nix
3030
uses: ./.github/actions/setup-nix-cache
3131
- name: Run agent
32-
uses: pullfrog/pullfrog@ce127b38d7f0c6c5e2c40ccd290adc4c5652357f # v0.1.82
32+
uses: pullfrog/pullfrog@99c5e781dd54463197d1109998386d37c84f6853 # v0.1.84
3333
with:
3434
prompt: ${{ inputs.prompt }}
3535
push: restricted

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
ref: main
3838
fetch-depth: 0
3939
- id: tagpr
40-
uses: Songmu/tagpr@7ebae2dcc300132baa7cc9dd108c8923b07fc366 # v1.20.3
40+
uses: Songmu/tagpr@2afc990a4a5a9a340665cc1a484c2102f7de332f # v1.21.0
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343

‎apps/ccusage/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ccusage",
3-
"version": "20.0.25",
3+
"version": "20.0.26",
44
"description": "Analyze coding (agent) CLI token usage and costs from local data",
55
"homepage": "https://github.com/ccusage/ccusage#readme",
66
"bugs": {

‎docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ccusage/docs",
3-
"version": "20.0.25",
3+
"version": "20.0.26",
44
"private": true,
55
"description": "Documentation for coding (agent) CLI usage analysis with ccusage",
66
"type": "module",

‎flake.lock‎

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

‎flake.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
66
pnpm-nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
7+
# Tirith 0.4 rejects existing shell and Nushell workflow bodies as incomplete.
8+
# Keep the last working scanner independent of routine nixpkgs updates.
9+
tirith-nixpkgs.url = "github:NixOS/nixpkgs/91cc1fdf6831e29b6c98768e721a72241f3d0797";
710
bun2nix = {
811
url = "github:nix-community/bun2nix";
912
inputs.nixpkgs.follows = "nixpkgs";
@@ -55,6 +58,7 @@
5558
./nix/git-hooks.nix
5659
./nix/packages.nix
5760
./nix/pnpm.nix
61+
./nix/tirith.nix
5862
./nix/static-package.nix
5963
./nix/darwin-x64-package.nix
6064
./nix/tests.nix

0 commit comments

Comments
 (0)