Skip to content

Commit 2e545b5

Browse files
authored
Merge branch 'main' into ci/uv-sync-locked
2 parents 1b4b4ad + 2e29f9e commit 2e545b5

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

.claude/rules/nix-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ devShells.default = pkgs.mkShellNoCC {
1616
uv
1717
ty
1818
just
19-
nixfmt-rfc-style
19+
nixfmt
2020
2121
# your new tool here
2222
new-tool

.github/actions/setup-nix/action.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ inputs:
99
description: "Skip uv sync step (useful for jobs that do not need Python dependencies)"
1010
required: false
1111
default: "false"
12-
skip-mock-server:
13-
description: "Skip MCP mock server dependencies installation (useful for jobs that do not run tests)"
14-
required: false
15-
default: "false"
1612
runs:
1713
using: "composite"
1814
steps:
@@ -46,7 +42,7 @@ runs:
4642
run: uv sync --all-extras --locked
4743

4844
- name: Install MCP mock server dependencies
49-
if: inputs.skip-uv-sync != 'true' && inputs.skip-mock-server != 'true'
45+
if: inputs.skip-uv-sync != 'true'
5046
shell: bash
5147
run: |
5248
if [ -f vendor/stackone-ai-node/package.json ]; then

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: ${{ steps.release.outputs.release_created }}
2929
uses: ./.github/actions/setup-nix
3030
with:
31-
skip-mock-server: "true"
31+
skip-uv-sync: "true"
3232

3333
- name: Update version in __init__.py
3434
if: ${{ steps.release.outputs.release_created }}

.release-please-config.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@
88
"include-v-in-tag": true,
99
"packages": {
1010
".": {
11-
"package-name": "stackone-ai"
11+
"package-name": "stackone-ai",
12+
"extra-files": [
13+
{
14+
"type": "generic",
15+
"path": "uv.lock",
16+
"glob": false
17+
}
18+
]
1219
}
1320
},
1421
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"

flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
projectRootFile = "flake.nix";
4040
programs = {
4141
nixfmt.enable = true;
42-
nixfmt.package = pkgs.nixfmt-rfc-style;
4342
ruff-check.enable = true;
4443
ruff-format.enable = true;
4544
};
@@ -94,7 +93,7 @@
9493
uv
9594
ty
9695
just
97-
nixfmt-rfc-style
96+
nixfmt
9897

9998
# security
10099
gitleaks

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)