9 Commits

Author SHA1 Message Date
dbcb719166 bump: v0.0.14 -> v0.0.15 2025-04-16 04:44:40 -04:00
cdbb7e2c4d fix: publish to ghcr too 2025-04-16 04:42:48 -04:00
3629be7e0e bump: v0.0.13 -> v0.0.14 2025-04-16 04:26:29 -04:00
32e767757b build(nix): updated nix hashes 2025-04-16 04:23:25 -04:00
c1b14e03ac build(client): updated npm dependencies 2025-04-16 04:22:07 -04:00
b466f5cfb0 bump: v0.0.12 -> v0.0.13 2025-04-16 03:41:47 -04:00
c2778f175f fix: update subpackage 2025-04-16 03:40:35 -04:00
35e6403067 fix: dumb npm cli bug 2025-04-16 03:38:46 -04:00
dc1fb3b8b4 fix: dumb npm cli bug 2025-04-16 03:38:36 -04:00
6 changed files with 62 additions and 28 deletions

View File

@ -45,16 +45,12 @@ jobs:
with:
# list of Docker images to use as base name for tags
images: |
spotdemo4/trevstack
${{ github.repository }}
ghcr.io/${{ github.repository }}
# generate Docker tags based on the following events/attributes
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Login to Docker Hub
uses: docker/login-action@v3
@ -62,6 +58,13 @@ jobs:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

View File

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

View File

@ -5,7 +5,7 @@ updated=false
echo "updating client"
cd "${git_root}/client"
npm update --save
npm update --save && npm i
if ! git diff --exit-code package.json package-lock.json; then
git add package-lock.json
git add package.json

View File

@ -1,12 +1,12 @@
{
"name": "trevstack",
"version": "0.0.12",
"version": "0.0.15",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "trevstack",
"version": "0.0.12",
"version": "0.0.15",
"devDependencies": {
"@connectrpc/connect": "^2.0.2",
"@connectrpc/connect-web": "^2.0.2",
@ -37,7 +37,7 @@
"tw-animate-css": "^1.2.5",
"typescript": "^5.8.3",
"typescript-eslint": "^8.30.1",
"vite": "^6.2.6"
"vite": "^6.3.0"
}
},
"node_modules/@ampproject/remapping": {
@ -6174,6 +6174,19 @@
"node": ">=8.6"
}
},
"node_modules/micromatch/node_modules/picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8.6"
},
"funding": {
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/minimatch": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@ -6367,13 +6380,13 @@
"license": "ISC"
},
"node_modules/picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8.6"
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/jonschlinkert"
@ -7363,6 +7376,23 @@
"node": ">=6"
}
},
"node_modules/tinyglobby": {
"version": "0.2.12",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
"integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
"dev": true,
"license": "MIT",
"dependencies": {
"fdir": "^6.4.3",
"picomatch": "^4.0.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"url": "https://github.com/sponsors/SuperchupuDev"
}
},
"node_modules/tippy.js": {
"version": "6.3.7",
"resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
@ -7722,15 +7752,18 @@
}
},
"node_modules/vite": {
"version": "6.2.6",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
"integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.0.tgz",
"integrity": "sha512-9aC0n4pr6hIbvi1YOpFjwQ+QOTGssvbJKoeYkuHHGWwlXfdxQlI8L2qNMo9awEEcCPSiS+5mJZk5jH1PAqoDeQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"esbuild": "^0.25.0",
"fdir": "^6.4.3",
"picomatch": "^4.0.2",
"postcss": "^8.5.3",
"rollup": "^4.30.1"
"rollup": "^4.34.9",
"tinyglobby": "^0.2.12"
},
"bin": {
"vite": "bin/vite.js"

View File

@ -1,7 +1,7 @@
{
"name": "trevstack",
"private": true,
"version": "0.0.12",
"version": "0.0.15",
"type": "module",
"scripts": {
"dev": "vite dev",
@ -43,6 +43,6 @@
"tw-animate-css": "^1.2.5",
"typescript": "^5.8.3",
"typescript-eslint": "^8.30.1",
"vite": "^6.2.6"
"vite": "^6.3.0"
}
}

View File

@ -12,7 +12,7 @@
...
}: let
pname = "trevstack";
version = "0.0.12";
version = "0.0.15";
supportedSystems = [
"x86_64-linux"
@ -86,13 +86,11 @@
formatter = forSystem ({pkgs, ...}: pkgs.alejandra);
packages = forSystem ({pkgs, ...}: rec {
default = trevstack;
trevstack-client = pkgs.buildNpmPackage {
pname = "${pname}-client";
inherit version;
src = ./client;
npmDepsHash = "sha256-o+ANqVBYztpQNAFTThSHdS+euteIGijUTZSXp2DlkDU=";
npmDepsHash = "sha256-nLo/vpRhKjugCGZ7JrxCYtMGv3X6FgLB9x8baYvKnv8=";
nodejs = pkgs.nodejs_22;
installPhase = ''
@ -100,16 +98,16 @@
chmod -R u+w "$out"
'';
};
trevstack = pkgs.buildGoModule {
inherit trevstack-client pname version;
src = ./server;
vendorHash = "sha256-yU+d3bKpMYVkZ9Etqe3cSDtFqswZYZK01d6vxDt/a5U=";
vendorHash = "sha256-ocOqypV4OjlepoMgYFpk/+zpRzBlHg/dljBVMZzS9Yg=";
preBuild = ''
cp -r ${trevstack-client} client
'';
};
default = trevstack;
});
};
}