bump: v0.0.34 -> v0.0.35

.gitea/workflows/release.yaml

@@ -47,12 +47,12 @@ jobs:
       - name: Build
         run: >
           nix build
-           #trevstack-linux-amd64
+          .#trevstack-linux-amd64
-           #trevstack-linux-arm64
+          .#trevstack-linux-arm64
-           #trevstack-linux-arm
+          .#trevstack-linux-arm
-           #trevstack-windows-amd64
+          .#trevstack-windows-amd64
-           #trevstack-darwin-amd64
+          .#trevstack-darwin-amd64
-           #trevstack-darwin-arm64
+          .#trevstack-darwin-arm64
 
       - name: Release
         uses: akkuman/gitea-release-action@v1
@@ -65,13 +65,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: release # Wait for binary cache to propagate
     steps:
+      - name: Get domain
+        id: get_domain
+        run: |
+          DOMAIN=$(basename ${{ gitea.server_url }})
+          echo $DOMAIN
+          echo "domain=$DOMAIN" >> $GITHUB_OUTPUT
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ${{ gitea.server_url }}/${{ gitea.repository }}
+            ${{ steps.get_domain.outputs.domain }}/${{ gitea.repository }}
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch

.github/workflows/release.yaml

@@ -51,12 +51,12 @@ jobs:
       - name: Build
         run: >
           nix build
-           #trevstack-linux-amd64
+          .#trevstack-linux-amd64
-           #trevstack-linux-arm64
+          .#trevstack-linux-arm64
-           #trevstack-linux-arm
+          .#trevstack-linux-arm
-           #trevstack-windows-amd64
+          .#trevstack-windows-amd64
-           #trevstack-darwin-amd64
+          .#trevstack-darwin-amd64
-           #trevstack-darwin-arm64
+          .#trevstack-darwin-arm64
 
       - name: Release
         uses: softprops/action-gh-release@v2

.scripts/bump.sh

@@ -19,7 +19,9 @@ echo "${version} -> ${next_version}"
 echo "bumping openapi"
 cd "${git_root}"
 sed -i -e "s/${version}/${next_version}/g" openapi.yaml
+sed -i -e "s/${version}/${next_version}/g" client/static/openapi/openapi.yaml
 git add openapi.yaml
+git add client/static/openapi/openapi.yaml
 
 echo "bumping client"
 cd "${git_root}/client"

README.md

@@ -42,7 +42,7 @@ It's that simple. If you're feeling fancy, install [direnv](https://direnv.net/)
 
 - `nix flake check`: runs all validations
 
-- `buf lint` & `buf generate`: lints and generates code from protocol buffers
+- `buf lint proto` & `buf generate`: lints and generates code from protocol buffers
 
 - `sqlc vet` & `sqlc generate`: verifies and generates code from SQL files
 
@@ -55,7 +55,7 @@ To use github actions for CI/CD, you'll need to create a fine-grained personal a
 - Contents (read and write)
 - Pull requests (read and write)
 
-and change some settings for the repository:
+And change some settings for the repository:
 
 - General -> Allow auto-merge: true
 - Rules -> Rulesets -> New ruleset
@@ -75,7 +75,7 @@ To use gitea actions for CI/CD, you'll need to create an [API token](https://doc
 - write:repository
 - write:package
 
-and change some settings for the repository:
+And change some settings for the repository:
 
 - Repository -> Delete pull request branch after merge by default: true
 - Branches -> Add New Rule

buf.gen.yaml

@@ -1,5 +1,8 @@
 version: v2
 clean: true
+inputs:
+  - directory: proto
+
 managed:
   enabled: true
   override:

client/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "trevstack",
-	"version": "0.0.31",
+	"version": "0.0.35",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "trevstack",
-			"version": "0.0.31",
+			"version": "0.0.35",
 			"devDependencies": {
 				"@bufbuild/protovalidate": "^0.1.1",
 				"@connectrpc/connect": "^2.0.2",

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "trevstack",
 	"private": true,
-	"version": "0.0.31",
+	"version": "0.0.35",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

client/static/openapi/openapi.yaml

@@ -3,8 +3,8 @@ servers:
   - url: /grpc
 info:
   title: Trevstack API
-  version: 1.0.0
+  version: 0.0.33
-  description: API for trevstack
+  description: API for Trevstack
   contact:
     name: Trev
     email: spam@trev.xyz

flake.nix

@@ -21,7 +21,7 @@
     ...
   }: let
     pname = "trevstack";
-    version = "0.0.31";
+    version = "0.0.35";
 
     build-systems = [
       "x86_64-linux"
@@ -127,7 +127,7 @@
           pname = "check-client";
           inherit version;
           src = ./client;
-          npmDepsHash = "sha256-9FUZNG+LEGWop0zpmTPx9d6TUOzjAMtLnxiH6HY6Vz4=";
+          npmDepsHash = "sha256-3Ry+R3xOtYmQXXbCxnoteIm41R8O3CYBJ4JxIfMjZOM=";
           dontNpmInstall = true;
 
           buildPhase = ''
@@ -190,7 +190,7 @@
         client = pkgs.buildNpmPackage {
           inherit pname version;
           src = ./client;
-          npmDepsHash = "sha256-9FUZNG+LEGWop0zpmTPx9d6TUOzjAMtLnxiH6HY6Vz4=";
+          npmDepsHash = "sha256-3Ry+R3xOtYmQXXbCxnoteIm41R8O3CYBJ4JxIfMjZOM=";
 
           installPhase = ''
             cp -r build "$out"

openapi.yaml

@@ -3,7 +3,7 @@ servers:
   - url: /grpc
 info:
   title: Trevstack API
-  version: 0.0.31
+  version: 0.0.35
   description: API for Trevstack
   contact:
     name: Trev

proto/buf.yaml

@@ -1,6 +1,6 @@
 # For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml
 version: v2
 modules:
-  - path: proto
+  - path: .
 deps:
   - buf.build/bufbuild/protovalidate