bump: v0.0.46 -> v0.0.47

.actions/init/action.yaml

@@ -0,0 +1,21 @@
+name: "Initialize"
+description: "Install nix & use cachix"
+
+inputs:
+  token:
+    description: "cachix auth token"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install nix
+      uses: cachix/install-nix-action@v31
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+
+    - name: Use cachix
+      uses: cachix/cachix-action@v16
+      with:
+        name: trevstack
+        authToken: "${{ inputs.token }}"

.actions/push/action.yaml

@@ -0,0 +1,63 @@
+name: "Docker Push"
+description: "Push to docker registry"
+
+inputs:
+  server_url:
+    required: true
+  repository:
+    required: true
+  tag:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set env
+      shell: bash
+      run: |
+        REGISTRY=$(basename ${{ inputs.server_url }})
+
+        NR=${{ inputs.repository }}
+        NAMESPACE="${NR%%/*}"
+        REPOSITORY="${NR##*/}"
+
+        TAG=${{ inputs.tag }}
+        VERSION=${TAG#v}
+
+        echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
+        echo "NAMESPACE=${NAMESPACE}" >> $GITHUB_ENV
+        echo "REPOSITORY=${REPOSITORY}" >> $GITHUB_ENV
+        echo "VERSION=${VERSION}" >> $GITHUB_ENV
+
+    - name: Push images
+      shell: bash
+      run: |
+        docker image tag $REPOSITORY:$VERSION-amd64 $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
+        docker push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
+
+        docker image tag $REPOSITORY:$VERSION-arm64 $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64
+        docker push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64
+
+        docker image tag $REPOSITORY:$VERSION-arm $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm
+        docker push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm
+
+    - name: Push manifest
+      shell: bash
+      run: |
+        docker manifest create $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64 \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64 \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64 --arch amd64
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64 --arch arm64
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm --arch arm
+        docker manifest push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION
+
+        docker manifest create $REGISTRY/$NAMESPACE/$REPOSITORY:latest \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64 \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64 \
+          $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:latest $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64 --arch amd64
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:latest $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm64 --arch arm64
+        docker manifest annotate $REGISTRY/$NAMESPACE/$REPOSITORY:latest $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-arm --arch arm
+        docker manifest push $REGISTRY/$NAMESPACE/$REPOSITORY:latest

.gitea/workflows/check.yaml

@@ -12,22 +12,12 @@ jobs:
     name: check
     runs-on: ubuntu-latest
     if: |
-      contains(gitea.event.head_commit.message, 'bump:') == false &&
-      contains(gitea.event.head_commit.message, 'Merge pull request') == false
+      contains(github.event.head_commit.message, 'bump:') == false &&
+      contains(github.event.head_commit.message, 'Merge pull request') == false
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Check
-        run: nix flake check
+      - run: nix flake check

.gitea/workflows/release.yaml

@@ -9,43 +9,23 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Check
-        run: nix flake check
+      - run: nix flake check
 
   release:
     runs-on: ubuntu-latest
     needs: check
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Build
-        run: >
+      - run: >
           nix build
           .#trevstack-linux-amd64
           .#trevstack-linux-arm64
@@ -54,52 +34,35 @@ jobs:
           .#trevstack-darwin-amd64
           .#trevstack-darwin-arm64
 
-      - name: Release
-        uses: akkuman/gitea-release-action@v1
+      - uses: akkuman/gitea-release-action@v1
         with:
           files: |-
             result*/bin/*
 
-  # https://docs.docker.com/build/ci/github-actions/manage-tags-labels/
   package:
     runs-on: ubuntu-latest
-    needs: release # Wait for binary cache to propagate
+    needs: release
     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
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          # list of Docker images to use as base name for tags
-          images: |
-            ${{ steps.get_domain.outputs.domain }}/${{ gitea.repository }}
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
+      - uses: docker/login-action@v3
         with:
-          registry: ${{ gitea.server_url }}
-          username: ${{ gitea.actor }}
+          registry: ${{ github.server_url }}
+          username: ${{ github.actor }}
           password: ${{ secrets.PAT }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - name: Build & load images
+        run: |
+          nix build .#trevstack-linux-amd64-image && ./result | docker load
+          nix build .#trevstack-linux-arm64-image && ./result | docker load
+          nix build .#trevstack-linux-arm-image && ./result | docker load
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
+      - name: Push images
+        uses: ./.actions/push
         with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          server_url: ${{ github.server_url }}
+          repository: ${{ github.repository }}
+          tag: ${{ github.ref_name }}

.gitea/workflows/update.yaml

@@ -9,33 +9,21 @@ jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          fetch-depth: 0
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       # https://github.com/actions/checkout/issues/13
-      - name: Set Git Config
+      - name: Set git config
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git checkout -B update
 
-      - name: Update
-        run: nix run .#update
+      - run: nix run .#update
 
-      - name: Create Pull Request
+      - name: Create pull request
         env:
           PAT: ${{ secrets.PAT }}
         run: |

.github/workflows/check.yaml

@@ -15,19 +15,9 @@ jobs:
       contains(github.event.head_commit.message, 'bump:') == false &&
       contains(github.event.head_commit.message, 'Merge pull request') == false
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Check
-        run: nix flake check
+      - run: nix flake check

.github/workflows/release.yaml

@@ -13,131 +13,61 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
+      - run: nix flake check
+
+  release:
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Check
-        run: nix flake check
+      - run: >
+          nix build
+          .#trevstack-linux-amd64
+          .#trevstack-linux-arm64
+          .#trevstack-linux-arm
+          .#trevstack-windows-amd64
+          .#trevstack-darwin-amd64
+          .#trevstack-darwin-arm64
 
-  # release:
-  #   runs-on: ubuntu-latest
-  #   needs: check
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
+      - uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          files: |-
+            result*/bin/*
 
-  #     - name: Install Nix
-  #       uses: cachix/install-nix-action@v31
-  #       with:
-  #         nix_path: nixpkgs=channel:nixos-unstable
-
-  #     - name: Use Cachix
-  #       uses: cachix/cachix-action@v16
-  #       with:
-  #         name: trevstack
-  #         authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-  #     - name: Build
-  #       run: >
-  #         nix build
-  #         .#trevstack-linux-amd64
-  #         .#trevstack-linux-arm64
-  #         .#trevstack-linux-arm
-  #         .#trevstack-windows-amd64
-  #         .#trevstack-darwin-amd64
-  #         .#trevstack-darwin-arm64
-
-  #     - name: Release
-  #       uses: softprops/action-gh-release@v2
-  #       with:
-  #         generate_release_notes: true
-  #         files: |-
-  #           result*/bin/*
-
-  # https://docs.docker.com/build/ci/github-actions/manage-tags-labels/
   package:
     runs-on: ubuntu-latest
-    needs: check # Wait for binary cache to propagate
+    needs: release
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Set env
-        run: |
-          TAG=${{ github.ref_name }}
-          VERSION=${TAG#v}
-          REPOSITORY=${{ github.repository }}
-          NAME="${REPOSITORY}:${VERSION}"
-          REGISTRY="ghcr.io"
-
-          echo "VERSION=${VERSION}" >> $GITHUB_ENV
-          echo "REPOSITORY=${REPOSITORY}" >> $GITHUB_ENV
-          echo "NAME=${NAME}" >> $GITHUB_ENV
-          echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & Load Images
+      - name: Build & load images
         run: |
           nix build .#trevstack-linux-amd64-image && ./result | docker load
           nix build .#trevstack-linux-arm64-image && ./result | docker load
           nix build .#trevstack-linux-arm-image && ./result | docker load
 
-      - name: Push Images
-        run: |
-          docker image tag trevstack:${VERSION}-amd64 ${REGISTRY}/${NAME}-amd64
-          docker push ${REGISTRY}/${NAME}-amd64
-
-          docker image tag trevstack:${VERSION}-arm64 ${REGISTRY}/${NAME}-arm64
-          docker push ${REGISTRY}/${NAME}-arm64
-
-          docker image tag trevstack:${VERSION}-arm ${REGISTRY}/${NAME}-arm
-          docker push ${REGISTRY}/${NAME}-arm
-
-      - name: Push Manifest
-        run: |
-          docker manifest create ${REGISTRY}/${NAME} \
-            ${REGISTRY}/${NAME}-amd64 \
-            ${REGISTRY}/${NAME}-arm64 \
-            ${REGISTRY}/${NAME}-arm
-          docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-amd64 --arch amd64
-          docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm64 --arch arm64
-          docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm --arch arm
-
-          docker manifest create ${REGISTRY}/${REPOSITORY}:latest \
-            ${REGISTRY}/${NAME}-amd64 \
-            ${REGISTRY}/${NAME}-arm64 \
-            ${REGISTRY}/${NAME}-arm
-          docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-amd64 --arch amd64
-          docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm64 --arch arm64
-          docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm --arch arm
-
-          docker manifest push ${REGISTRY}/${NAME}
-          docker manifest push ${REGISTRY}/${REPOSITORY}:latest
+      - name: Push images
+        uses: ./.actions/push
+        with:
+          server_url: ghcr.io
+          repository: ${{ github.repository }}
+          tag: ${{ github.ref_name }}

.github/workflows/update.yaml

@@ -13,30 +13,20 @@ jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+      - uses: ./.actions/init
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Use Cachix
-        uses: cachix/cachix-action@v16
-        with:
-          name: trevstack
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       # https://github.com/actions/checkout/issues/13
-      - name: Set Git Config
+      - name: Set git config
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Update
-        run: nix run .#update
+      - run: nix run .#update
 
-      - name: Create Pull Request
+      - name: Create pull request
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
@@ -44,7 +34,7 @@ jobs:
           title: update
           body: automatic update
 
-      - name: Enable Automerge
+      - name: Enable automerge
         run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
         env:
           GH_TOKEN: ${{ secrets.PAT }}

.scripts/update.sh

@@ -12,6 +12,7 @@ if ! git diff --exit-code flake.lock; then
 fi
 
 echo "updating protobuf deps"
+cd "${git_root}/proto"
 buf dep update
 if ! git diff --exit-code buf.lock; then
     git add buf.lock

client/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "trevstack",
-	"version": "0.0.42",
+	"version": "0.0.47",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "trevstack",
-			"version": "0.0.42",
+			"version": "0.0.47",
 			"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.42",
+	"version": "0.0.47",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

flake.nix

@@ -21,7 +21,7 @@
     ...
   }: let
     pname = "trevstack";
-    version = "0.0.42";
+    version = "0.0.47";
 
     build-systems = [
       "x86_64-linux"
@@ -130,7 +130,7 @@
           pname = "check-client";
           inherit version;
           src = ./client;
-          npmDepsHash = "sha256-mmKVf0hmLfI1cP76QuLNKFmjTV2Lf1TlbVIR/DULuWA=";
+          npmDepsHash = "sha256-9n7P+e3q8ZYkaGKjiBLJo+Qq1QNS432BsGTHL0hcAks=";
           dontNpmInstall = true;
 
           buildPhase = ''
@@ -193,7 +193,7 @@
         client = pkgs.buildNpmPackage {
           inherit pname version;
           src = ./client;
-          npmDepsHash = "sha256-mmKVf0hmLfI1cP76QuLNKFmjTV2Lf1TlbVIR/DULuWA=";
+          npmDepsHash = "sha256-9n7P+e3q8ZYkaGKjiBLJo+Qq1QNS432BsGTHL0hcAks=";
 
           installPhase = ''
             cp -r build "$out"

openapi.yaml

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