trev/trevstack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 9 Activity

refactor: scripts to apps

Browse Source
This commit is contained in:
trev 2025-04-17 22:00:23 -04:00
parent 24d3067e52
commit ad9ac18c18
4 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/update.yaml vendored
View File

@ -28,13 +28,9 @@ jobs:
run: | run: |
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Install NPM Packages
working-directory: ./client
run: npm i && npm ci # https://github.com/npm/cli/issues/7793
- name: Update - name: Update
run: nix develop --command trevstack-update run: nix run .#update
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v7 uses: peter-evans/create-pull-request@v7

4
.scripts/bump.sh
View File

@ -7,13 +7,13 @@ next_version=$(echo "${version}" | awk -F. -v OFS=. '{$NF += 1 ; print}')
echo "bumping client" echo "bumping client"
cd "${git_root}/client" cd "${git_root}/client"
npm version "${next_version}" && npm i npm version "${next_version}"
git add package-lock.json git add package-lock.json
git add package.json git add package.json
echo "bumping nix" echo "bumping nix"
cd "${git_root}" cd "${git_root}"
nix-update --flake --version "${next_version}" --subpackage trevstack-client trevstack nix-update --flake --version "${next_version}" --subpackage client default
git add flake.nix git add flake.nix
git commit -m "bump: v${version} -> v${next_version}" git commit -m "bump: v${version} -> v${next_version}"

2
.scripts/update.sh
View File

@ -35,7 +35,7 @@ fi
if [ "${updated}" = true ]; then if [ "${updated}" = true ]; then
echo "updating nix hashes" echo "updating nix hashes"
cd "${git_root}" cd "${git_root}"
nix-update --flake --version=skip --subpackage trevstack-client trevstack nix-update --flake --version=skip --subpackage client default
git add flake.nix git add flake.nix
git commit -m "build(nix): updated nix hashes" git commit -m "build(nix): updated nix hashes"
else else

86
flake.nix
View File

@ -79,43 +79,33 @@
}; };
in { in {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; packages = with pkgs; [
[ git
git nix-update
nix-update treli.packages."${system}".default
treli.packages."${system}".default
# Server # Server
go go
gotools gotools
gopls gopls
revive revive
sqlc sqlc
# database # database
sqlite sqlite
dbmate dbmate
sqlfluff sqlfluff
# Protobuf # Protobuf
buf buf
protoc-gen-go protoc-gen-go
protoc-gen-connect-go protoc-gen-connect-go
protoc-gen-es protoc-gen-es
protoc-gen-connect-openapi protoc-gen-connect-openapi
# Client # Client
nodejs_22 nodejs_22
] ];
# Use .scripts
++ map (
x: (
pkgs.writeShellApplication {
name = "${pname}-${(lib.nameFromURL (baseNameOf x) ".")}";
text = builtins.readFile x;
}
)
) (pkgs.lib.filesystem.listFilesRecursive ./.scripts);
}; };
}); });
@ -173,6 +163,36 @@
''; '';
}); });
apps = forSystem ({pkgs, ...}: {
update = {
type = "app";
program = pkgs.lib.getExe pkgs.writeShellApplication {
name = "update";
runtimeInputs = with pkgs; [
git
nix
nodejs_22
go
nix-update
];
text = builtins.readFile ./.scripts/update.sh;
};
};
bump = {
type = "app";
program = pkgs.lib.getExe pkgs.writeShellApplication {
name = "bump";
runtimeInputs = with pkgs; [
git
nodejs_22
nix-update
];
text = builtins.readFile ./.scripts/bump.sh;
};
};
});
formatter = forSystem ({pkgs, ...}: pkgs.alejandra); formatter = forSystem ({pkgs, ...}: pkgs.alejandra);
packages = forSystem ( packages = forSystem (