69 Commits

Author SHA1 Message Date
0a91ad4d82 build(nix): updated nix hashes
Some checks failed
Check / check (pull_request) Failing after 1m21s
Check / update (pull_request) Has been skipped
Check / push (pull_request) Has been skipped
2025-06-16 18:05:33 +00:00
09c5b2341a build(client): updated npm dependencies 2025-06-16 18:04:23 +00:00
49138061fe build(buf): updated buf dependencies 2025-06-16 18:03:51 +00:00
9aafd614b6 build(nix): updated nix dependencies 2025-06-16 18:03:50 +00:00
5bb6311fea fix: create pull request
All checks were successful
Check / check (push) Successful in 1m5s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 14:01:05 -04:00
8cc54fb466 test: create pull request
All checks were successful
Check / check (push) Successful in 1m5s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 13:53:20 -04:00
6f87b1f4da fix: gitea update
All checks were successful
Check / check (push) Successful in 1m5s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 13:45:13 -04:00
99379efa15 fix: rename util
All checks were successful
Check / check (push) Successful in 1m22s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 12:50:23 -04:00
534a6e2bf9 ci: on all pull request actions
All checks were successful
Check / check (push) Successful in 1m6s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 12:21:56 -04:00
c01fc59271 ci: push to prod
All checks were successful
Check / check (push) Successful in 1m7s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s
2025-06-16 12:12:15 -04:00
1030363896 merge gitea & github
All checks were successful
Check / check (push) Successful in 1m27s
2025-06-16 12:06:16 -04:00
633629ca91 Merge pull request #26 from spotdemo4/update
update
2025-05-31 20:17:00 -04:00
26eb08d37c build(nix): updated nix hashes 2025-06-01 00:14:38 +00:00
156c804d1a build(client): updated npm dependencies 2025-06-01 00:12:53 +00:00
78ece703ef Merge pull request #25 from spotdemo4/update
update
2025-05-30 20:14:37 -04:00
185649671f build(nix): updated nix hashes 2025-05-31 00:12:19 +00:00
25da3aea19 build(client): updated npm dependencies 2025-05-31 00:10:34 +00:00
a0206c3287 build(nix): updated nix dependencies 2025-05-31 00:09:58 +00:00
bd0a8e223e Merge pull request #24 from spotdemo4/update
update
2025-05-29 20:15:14 -04:00
eeca47790b build(nix): updated nix hashes 2025-05-30 00:12:50 +00:00
1db7805031 build(client): updated npm dependencies 2025-05-30 00:11:03 +00:00
66630d84fb Merge pull request #23 from spotdemo4/update
update
2025-05-28 20:14:52 -04:00
44b495a282 build(nix): updated nix hashes 2025-05-29 00:12:33 +00:00
dfe30ecade build(client): updated npm dependencies 2025-05-29 00:10:48 +00:00
f95156febb build(nix): updated nix dependencies 2025-05-29 00:10:18 +00:00
8896100e3d Merge pull request #22 from spotdemo4/update
update
2025-05-27 20:15:19 -04:00
1ed8493bb7 build(nix): updated nix hashes 2025-05-28 00:12:57 +00:00
3e61e45655 build(client): updated npm dependencies 2025-05-28 00:11:07 +00:00
e10c14b3e0 Merge pull request #21 from spotdemo4/update
update
2025-05-26 20:14:30 -04:00
77ef734baa build(nix): updated nix hashes 2025-05-27 00:12:26 +00:00
b3584332c5 build(client): updated npm dependencies 2025-05-27 00:10:39 +00:00
6fa6704f1c build(nix): updated nix dependencies 2025-05-27 00:10:03 +00:00
26c678a3e5 Merge pull request #20 from spotdemo4/update
update
2025-05-25 20:14:38 -04:00
3a142ad595 build(nix): updated nix hashes 2025-05-26 00:12:39 +00:00
1c317b3154 build(client): updated npm dependencies 2025-05-26 00:10:50 +00:00
ade88cf810 Merge pull request #19 from spotdemo4/update
update
2025-05-24 20:15:29 -04:00
f4ae33c00d build(nix): updated nix hashes 2025-05-25 00:13:32 +00:00
13c1eaf77f build(client): updated npm dependencies 2025-05-25 00:11:48 +00:00
f475f6e64d build(nix): updated nix dependencies 2025-05-25 00:11:09 +00:00
a93ad92ab9 Merge pull request #18 from spotdemo4/update
update
2025-05-23 20:13:58 -04:00
23c807d508 build(nix): updated nix hashes 2025-05-24 00:11:59 +00:00
3d01527e92 build(client): updated npm dependencies 2025-05-24 00:10:07 +00:00
b19fdce370 Merge pull request #17 from spotdemo4/update
update
2025-05-22 20:14:39 -04:00
a69e2ffa40 build(nix): updated nix hashes 2025-05-23 00:12:33 +00:00
35df911072 build(client): updated npm dependencies 2025-05-23 00:10:41 +00:00
bd24a3c84b Merge pull request #16 from spotdemo4/update
update
2025-05-21 20:14:25 -04:00
0cdbfeaca9 build(nix): updated nix hashes 2025-05-22 00:12:20 +00:00
afa88b6274 build(client): updated npm dependencies 2025-05-22 00:10:29 +00:00
89651cdbf6 build(nix): updated nix dependencies 2025-05-22 00:09:59 +00:00
dabb473e0f Merge pull request #15 from spotdemo4/update
update
2025-05-20 20:14:32 -04:00
5a3c4e7369 build(nix): updated nix hashes 2025-05-21 00:12:29 +00:00
f7070590b8 build(client): updated npm dependencies 2025-05-21 00:10:43 +00:00
e6b378c170 style: remove unnecessary .dockerignore
All checks were successful
Check / check (push) Successful in 1m2s
Update / update (push) Successful in 2m59s
2025-05-20 10:07:29 -04:00
fe05a64eb0 Merge pull request #14 from spotdemo4/update
update
2025-05-19 20:15:12 -04:00
7b3d66886d build(nix): updated nix hashes 2025-05-20 00:12:53 +00:00
bc74994ac4 build(client): updated npm dependencies 2025-05-20 00:11:03 +00:00
e20a67f7a4 Merge pull request #13 from spotdemo4/update
update
2025-05-18 20:14:57 -04:00
01e2f3eca3 build(nix): updated nix hashes 2025-05-19 00:12:51 +00:00
95a2a00cec build(client): updated npm dependencies 2025-05-19 00:11:04 +00:00
b6058aa434 build(nix): updated nix dependencies 2025-05-19 00:10:26 +00:00
0adbbc3f06 Merge pull request #12 from spotdemo4/update
update
2025-05-17 20:15:32 -04:00
46058ae5d6 build(nix): updated nix hashes 2025-05-18 00:13:30 +00:00
94b367c2fb build(client): updated npm dependencies 2025-05-18 00:11:36 +00:00
548efa254c build(nix): updated nix dependencies 2025-05-18 00:10:57 +00:00
68166c8d3a fix: don't prepend https. I honestly don't know how it was working before
All checks were successful
Check / check (push) Successful in 52s
Update / update (push) Successful in 3m41s
2025-05-17 04:55:04 -04:00
3a5fa69bf6 bump: v0.0.46 -> v0.0.47
All checks were successful
Check / check (push) Has been skipped
Release / check (push) Successful in 51s
Release / release (push) Successful in 2m42s
Release / package (push) Successful in 49s
2025-05-17 04:50:43 -04:00
23be247cdb fix: correct name
All checks were successful
Check / check (push) Successful in 56s
2025-05-17 04:49:14 -04:00
9a204d3808 fix: use ghcr for github 2025-05-17 04:47:55 -04:00
00e36b6c77 fix: change update path for protobuf deps
All checks were successful
Check / check (push) Successful in 54s
2025-05-17 04:34:06 -04:00
20 changed files with 1186 additions and 1891 deletions

View File

@ -1,21 +0,0 @@
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 }}"

View File

@ -1,63 +0,0 @@
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 $HOST/$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

View File

@ -1,14 +0,0 @@
.env
/docker-compose.*
/result*
/.direnv/
/build/
# Client
/client/node_modules/
/client/.svelte-kit/
# Server
/server/client/
/server/tmp/
/server/build/

View File

@ -5,7 +5,6 @@ on:
branches: branches:
- main - main
pull_request: pull_request:
types: [opened, reopened, edited, auto_merge_enabled]
jobs: jobs:
check: check:
@ -16,8 +15,51 @@ jobs:
contains(github.event.head_commit.message, 'Merge pull request') == false contains(github.event.head_commit.message, 'Merge pull request') == false
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix flake check - 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 }}"
- run: nix flake check --accept-flake-config
push:
name: push
runs-on: ubuntu-latest
needs: check
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: "0"
# https://github.com/actions/checkout/issues/13
- name: Push to Production
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git push origin main:production
update:
name: update
runs-on: ubuntu-latest
if: ${{ contains(github.event.head_commit.message, 'Merge pull request') }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: "0"
# https://github.com/actions/checkout/issues/13
- name: Push to Production
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git push origin main:production

View File

@ -21,9 +21,17 @@ jobs:
needs: check needs: check
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: > - run: >
nix build nix build
@ -44,9 +52,17 @@ jobs:
needs: release needs: release
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- uses: docker/login-action@v3 - uses: docker/login-action@v3
with: with:
@ -60,9 +76,51 @@ jobs:
nix build .#trevstack-linux-arm64-image && ./result | docker load nix build .#trevstack-linux-arm64-image && ./result | docker load
nix build .#trevstack-linux-arm-image && ./result | docker load nix build .#trevstack-linux-arm-image && ./result | docker load
- name: Set env
shell: bash
run: |
REGISTRY=$(basename ${{ github.server_url }})
NR=${{ github.repository }}
NAMESPACE="${NR%%/*}"
REPOSITORY="${NR##*/}"
TAG=${{ github.ref_name }}
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 - name: Push images
uses: ./.actions/push shell: bash
with: run: |
server_url: ${{ github.server_url }} docker image tag $REPOSITORY:$VERSION-amd64 $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
repository: ${{ github.repository }} docker push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
tag: ${{ github.ref_name }}
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

View File

@ -10,9 +10,17 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
# https://github.com/actions/checkout/issues/13 # https://github.com/actions/checkout/issues/13
- name: Set git config - name: Set git config
@ -27,24 +35,27 @@ jobs:
env: env:
PAT: ${{ secrets.PAT }} PAT: ${{ secrets.PAT }}
run: | run: |
git push origin update --force
URL="${{ gitea.server_url }}" URL="${{ gitea.server_url }}"
REPO_OWNER_SLASH_NAME="${{ gitea.repository }}" REPO_OWNER_SLASH_NAME="${{ gitea.repository }}"
if ! git ls-remote --exit-code origin update; then PRS=$(curl -s -X GET -H "Authorization: token $PAT" \
git push origin update --force -H "Content-Type: application/json" \
"$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls?state=open")
PR_UPDATE=$(echo "$PRS" | jq -cr '.[] | select( .title | contains("update") )')
PR_RESPONSE=$(curl -s -X POST -H "Authorization: token $PAT" \ if [ -z "$PR_UPDATE" ]; then
echo "Creating pull request"
PR_CREATE=$(curl -s -X POST -H "Authorization: token $PAT" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{"title":"update","body":"automatic update","head":"update","base":"main"}' \ -d '{"title":"update","body":"automatic update","head":"update","base":"main"}' \
"https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls") "$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls")
PR_NUMBER=$(echo "$PR_CREATE" | jq -r '.number')
PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
curl -s -X POST -H "Authorization: token $PAT" \ curl -s -X POST -H "Authorization: token $PAT" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{"Do":"merge","merge_when_checks_succeed":true,"delete_branch_after_merge":true}' \ -d '{"Do":"merge","merge_when_checks_succeed":true,"delete_branch_after_merge":true}' \
"https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/$PR_NUMBER/merge" "$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/$PR_NUMBER/merge"
else
git push origin update --force
fi fi

View File

@ -5,7 +5,6 @@ on:
branches: branches:
- main - main
pull_request: pull_request:
types: [opened, reopened, edited, auto_merge_enabled]
jobs: jobs:
check: check:
@ -16,8 +15,51 @@ jobs:
contains(github.event.head_commit.message, 'Merge pull request') == false contains(github.event.head_commit.message, 'Merge pull request') == false
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix flake check - 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 }}"
- run: nix flake check --accept-flake-config
push:
name: push
runs-on: ubuntu-latest
needs: check
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: "0"
# https://github.com/actions/checkout/issues/13
- name: Push to Production
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git push origin main:production
update:
name: update
runs-on: ubuntu-latest
if: ${{ contains(github.event.head_commit.message, 'Merge pull request') }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: "0"
# https://github.com/actions/checkout/issues/13
- name: Push to Production
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git push origin main:production

View File

@ -14,9 +14,17 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix flake check - run: nix flake check
@ -49,9 +57,17 @@ jobs:
needs: release needs: release
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- uses: docker/login-action@v3 - uses: docker/login-action@v3
with: with:
@ -65,9 +81,51 @@ jobs:
nix build .#trevstack-linux-arm64-image && ./result | docker load nix build .#trevstack-linux-arm64-image && ./result | docker load
nix build .#trevstack-linux-arm-image && ./result | docker load nix build .#trevstack-linux-arm-image && ./result | docker load
- name: Set env
shell: bash
run: |
REGISTRY=$(basename ${{ github.server_url }})
NR=${{ github.repository }}
NAMESPACE="${NR%%/*}"
REPOSITORY="${NR##*/}"
TAG=${{ github.ref_name }}
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 - name: Push images
uses: ./.actions/push shell: bash
with: run: |
server_url: ${{ github.server_url }} docker image tag $REPOSITORY:$VERSION-amd64 $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
repository: ${{ github.repository }} docker push $REGISTRY/$NAMESPACE/$REPOSITORY:$VERSION-amd64
tag: ${{ github.ref_name }}
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

View File

@ -14,9 +14,17 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.actions/init
- name: Install nix
uses: cachix/install-nix-action@v31
with: with:
token: "${{ secrets.CACHIX_AUTH_TOKEN }}" nix_path: nixpkgs=channel:nixos-unstable
- name: Use cachix
uses: cachix/cachix-action@v16
with:
name: trevstack
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
# https://github.com/actions/checkout/issues/13 # https://github.com/actions/checkout/issues/13
- name: Set git config - name: Set git config

View File

@ -5,13 +5,14 @@ updated=false
echo "updating nix flake" echo "updating nix flake"
cd "${git_root}" cd "${git_root}"
nix flake update nix flake update --accept-flake-config
if ! git diff --exit-code flake.lock; then if ! git diff --exit-code flake.lock; then
git add flake.lock git add flake.lock
git commit -m "build(nix): updated nix dependencies" git commit -m "build(nix): updated nix dependencies"
fi fi
echo "updating protobuf deps" echo "updating protobuf deps"
cd "${git_root}/proto"
buf dep update buf dep update
if ! git diff --exit-code buf.lock; then if ! git diff --exit-code buf.lock; then
git add buf.lock git add buf.lock

2591
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
{ {
"name": "trevstack", "name": "trevstack",
"private": true, "private": true,
"version": "0.0.46", "version": "0.0.47",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
@ -17,35 +17,35 @@
"@bufbuild/protovalidate": "^0.1.1", "@bufbuild/protovalidate": "^0.1.1",
"@connectrpc/connect": "^2.0.2", "@connectrpc/connect": "^2.0.2",
"@connectrpc/connect-web": "^2.0.2", "@connectrpc/connect-web": "^2.0.2",
"@eslint/compat": "^1.2.9", "@eslint/compat": "^1.3.0",
"@eslint/js": "^9.18.0", "@eslint/js": "^9.18.0",
"@ianvs/prettier-plugin-sort-imports": "^4.4.1", "@ianvs/prettier-plugin-sort-imports": "^4.4.2",
"@lucide/svelte": "^0.479.0", "@lucide/svelte": "^0.479.0",
"@scalar/api-reference": "^1.28.33", "@scalar/api-reference": "^1.31.11",
"@simplewebauthn/browser": "^13.1.0", "@simplewebauthn/browser": "^13.1.0",
"@sveltejs/adapter-static": "^3.0.8", "@sveltejs/adapter-static": "^3.0.8",
"@sveltejs/kit": "^2.21.0", "@sveltejs/kit": "^2.21.5",
"@sveltejs/vite-plugin-svelte": "^5.0.3", "@sveltejs/vite-plugin-svelte": "^5.1.0",
"@tailwindcss/vite": "^4.1.6", "@tailwindcss/vite": "^4.1.10",
"bits-ui": "^1.4.8", "bits-ui": "^1.8.0",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"eslint": "^9.26.0", "eslint": "^9.29.0",
"eslint-config-prettier": "^10.1.5", "eslint-config-prettier": "^10.1.5",
"eslint-plugin-svelte": "^3.6.0", "eslint-plugin-svelte": "^3.9.2",
"globals": "^16.1.0", "globals": "^16.2.0",
"mode-watcher": "^1.0.7", "mode-watcher": "^1.0.8",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"prettier-plugin-svelte": "^3.3.3", "prettier-plugin-svelte": "^3.4.0",
"prettier-plugin-tailwindcss": "^0.6.11", "prettier-plugin-tailwindcss": "^0.6.12",
"svelte": "^5.28.6", "svelte": "^5.34.3",
"svelte-check": "^4.1.7", "svelte-check": "^4.2.1",
"svelte-sonner": "^0.3.28", "svelte-sonner": "^0.3.28",
"tailwind-merge": "^3.3.0", "tailwind-merge": "^3.3.1",
"tailwind-variants": "^1.0.0", "tailwind-variants": "^1.0.0",
"tailwindcss": "^4.0.13", "tailwindcss": "^4.0.13",
"tw-animate-css": "^1.2.9", "tw-animate-css": "^1.3.4",
"typescript": "^5.8.3", "typescript": "^5.8.3",
"typescript-eslint": "^8.32.1", "typescript-eslint": "^8.34.1",
"vite": "^6.3.5" "vite": "^6.3.5"
} }
} }

6
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747179050, "lastModified": 1749794982,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -21,7 +21,7 @@
... ...
}: let }: let
pname = "trevstack"; pname = "trevstack";
version = "0.0.46"; version = "0.0.47";
build-systems = [ build-systems = [
"x86_64-linux" "x86_64-linux"
@ -130,7 +130,7 @@
pname = "check-client"; pname = "check-client";
inherit version; inherit version;
src = ./client; src = ./client;
npmDepsHash = "sha256-s87mYmEO8gJNAPSnC8U+jV+Gc86iFGq2oJaGbK8AbhQ="; npmDepsHash = "sha256-2c1s0CFR3aWZPq/cO7dtF6ri+XEFdkmjAietktaC9Y0=";
dontNpmInstall = true; dontNpmInstall = true;
buildPhase = '' buildPhase = ''
@ -193,7 +193,7 @@
client = pkgs.buildNpmPackage { client = pkgs.buildNpmPackage {
inherit pname version; inherit pname version;
src = ./client; src = ./client;
npmDepsHash = "sha256-s87mYmEO8gJNAPSnC8U+jV+Gc86iFGq2oJaGbK8AbhQ="; npmDepsHash = "sha256-2c1s0CFR3aWZPq/cO7dtF6ri+XEFdkmjAietktaC9Y0=";
installPhase = '' installPhase = ''
cp -r build "$out" cp -r build "$out"

View File

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

View File

@ -2,5 +2,5 @@
version: v2 version: v2
deps: deps:
- name: buf.build/bufbuild/protovalidate - name: buf.build/bufbuild/protovalidate
commit: 8976f5be98c146529b1cc15cd2012b60 commit: 9f2d3c737feb481a83375159c0733275
digest: b5:5d513af91a439d9e78cacac0c9455c7cb885a8737d30405d0b91974fe05276d19c07a876a51a107213a3d01b83ecc912996cdad4cddf7231f91379079cf7488d digest: b5:19d3b83f7df2d284ff5935f4622d7f27e7464a93c210edb536e92a52bcc69b2a18da1312e96b5461601eba7b3764d5e90321bd62e6966870e7dbc2e4dedd98d6

View File

@ -12,8 +12,8 @@ import (
itemv1 "github.com/spotdemo4/trevstack/server/internal/connect/item/v1" itemv1 "github.com/spotdemo4/trevstack/server/internal/connect/item/v1"
"github.com/spotdemo4/trevstack/server/internal/connect/item/v1/itemv1connect" "github.com/spotdemo4/trevstack/server/internal/connect/item/v1/itemv1connect"
"github.com/spotdemo4/trevstack/server/internal/interceptors" "github.com/spotdemo4/trevstack/server/internal/interceptors"
"github.com/spotdemo4/trevstack/server/internal/putil"
"github.com/spotdemo4/trevstack/server/internal/sqlc" "github.com/spotdemo4/trevstack/server/internal/sqlc"
"github.com/spotdemo4/trevstack/server/internal/util"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )
@ -80,9 +80,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
// Get items // Get items
items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{ items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{
UserID: userid, UserID: userid,
Name: util.NullLike(req.Msg.Filter), Name: putil.NullLike(req.Msg.Filter),
Start: util.NullTimestamp(req.Msg.Start), Start: putil.NullTimestamp(req.Msg.Start),
End: util.NullTimestamp(req.Msg.End), End: putil.NullTimestamp(req.Msg.End),
Offset: int64(offset), Offset: int64(offset),
Limit: int64(limit), Limit: int64(limit),
}) })
@ -97,9 +97,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
// Get items count // Get items count
count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{ count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{
UserID: userid, UserID: userid,
Name: util.NullLike(req.Msg.Filter), Name: putil.NullLike(req.Msg.Filter),
Start: util.NullTimestamp(req.Msg.Start), Start: putil.NullTimestamp(req.Msg.Start),
End: util.NullTimestamp(req.Msg.End), End: putil.NullTimestamp(req.Msg.End),
}) })
if err != nil { if err != nil {
return nil, connect.NewError(connect.CodeInternal, err) return nil, connect.NewError(connect.CodeInternal, err)
@ -157,8 +157,8 @@ func (h *Handler) UpdateItem(ctx context.Context, req *connect.Request[itemv1.Up
// set // set
Name: req.Msg.Name, Name: req.Msg.Name,
Description: req.Msg.Description, Description: req.Msg.Description,
Price: util.NullFloat64(req.Msg.Price), Price: putil.NullFloat64(req.Msg.Price),
Quantity: util.NullInt64(req.Msg.Quantity), Quantity: putil.NullInt64(req.Msg.Quantity),
// where // where
ID: req.Msg.Id, ID: req.Msg.Id,

View File

@ -19,8 +19,8 @@ import (
userv1 "github.com/spotdemo4/trevstack/server/internal/connect/user/v1" userv1 "github.com/spotdemo4/trevstack/server/internal/connect/user/v1"
"github.com/spotdemo4/trevstack/server/internal/connect/user/v1/userv1connect" "github.com/spotdemo4/trevstack/server/internal/connect/user/v1/userv1connect"
"github.com/spotdemo4/trevstack/server/internal/interceptors" "github.com/spotdemo4/trevstack/server/internal/interceptors"
"github.com/spotdemo4/trevstack/server/internal/putil"
"github.com/spotdemo4/trevstack/server/internal/sqlc" "github.com/spotdemo4/trevstack/server/internal/sqlc"
"github.com/spotdemo4/trevstack/server/internal/util"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -96,7 +96,7 @@ func (h *Handler) UpdatePassword(ctx context.Context, req *connect.Request[userv
// Update password // Update password
err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{ err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{
Password: util.ToPointer(string(hash)), Password: putil.ToPointer(string(hash)),
ID: userid, ID: userid,
}) })
if err != nil { if err != nil {

View File

@ -1,4 +1,4 @@
package util package putil
func DerefOrEmpty[T any](val *T) T { func DerefOrEmpty[T any](val *T) T {
if val == nil { if val == nil {

View File

@ -1,4 +1,4 @@
package util package putil
import ( import (
"fmt" "fmt"