Compare commits
69 Commits
v0.0.46
...
0a91ad4d82
Author | SHA1 | Date | |
---|---|---|---|
0a91ad4d82 | |||
09c5b2341a | |||
49138061fe | |||
9aafd614b6 | |||
5bb6311fea | |||
8cc54fb466 | |||
6f87b1f4da | |||
99379efa15 | |||
534a6e2bf9 | |||
c01fc59271 | |||
1030363896 | |||
633629ca91 | |||
26eb08d37c | |||
156c804d1a | |||
78ece703ef | |||
185649671f | |||
25da3aea19 | |||
a0206c3287 | |||
bd0a8e223e | |||
eeca47790b | |||
1db7805031 | |||
66630d84fb | |||
44b495a282 | |||
dfe30ecade | |||
f95156febb | |||
8896100e3d | |||
1ed8493bb7 | |||
3e61e45655 | |||
e10c14b3e0 | |||
77ef734baa | |||
b3584332c5 | |||
6fa6704f1c | |||
26c678a3e5 | |||
3a142ad595 | |||
1c317b3154 | |||
ade88cf810 | |||
f4ae33c00d | |||
13c1eaf77f | |||
f475f6e64d | |||
a93ad92ab9 | |||
23c807d508 | |||
3d01527e92 | |||
b19fdce370 | |||
a69e2ffa40 | |||
35df911072 | |||
bd24a3c84b | |||
0cdbfeaca9 | |||
afa88b6274 | |||
89651cdbf6 | |||
dabb473e0f | |||
5a3c4e7369 | |||
f7070590b8 | |||
e6b378c170 | |||
fe05a64eb0 | |||
7b3d66886d | |||
bc74994ac4 | |||
e20a67f7a4 | |||
01e2f3eca3 | |||
95a2a00cec | |||
b6058aa434 | |||
0adbbc3f06 | |||
46058ae5d6 | |||
94b367c2fb | |||
548efa254c | |||
68166c8d3a | |||
3a5fa69bf6 | |||
23be247cdb | |||
9a204d3808 | |||
00e36b6c77 |
@ -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 }}"
|
@ -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
|
@ -1,14 +0,0 @@
|
||||
.env
|
||||
/docker-compose.*
|
||||
/result*
|
||||
/.direnv/
|
||||
/build/
|
||||
|
||||
# Client
|
||||
/client/node_modules/
|
||||
/client/.svelte-kit/
|
||||
|
||||
# Server
|
||||
/server/client/
|
||||
/server/tmp/
|
||||
/server/build/
|
@ -5,7 +5,6 @@ on:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
types: [opened, reopened, edited, auto_merge_enabled]
|
||||
|
||||
jobs:
|
||||
check:
|
||||
@ -16,8 +15,51 @@ jobs:
|
||||
contains(github.event.head_commit.message, 'Merge pull request') == false
|
||||
steps:
|
||||
- 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
|
||||
|
@ -21,9 +21,17 @@ jobs:
|
||||
needs: check
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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 build
|
||||
@ -44,9 +52,17 @@ jobs:
|
||||
needs: release
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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
|
||||
with:
|
||||
@ -60,9 +76,51 @@ jobs:
|
||||
nix build .#trevstack-linux-arm64-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
|
||||
uses: ./.actions/push
|
||||
with:
|
||||
server_url: ${{ github.server_url }}
|
||||
repository: ${{ github.repository }}
|
||||
tag: ${{ github.ref_name }}
|
||||
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
|
||||
|
@ -10,9 +10,17 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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
|
||||
- name: Set git config
|
||||
@ -27,24 +35,27 @@ jobs:
|
||||
env:
|
||||
PAT: ${{ secrets.PAT }}
|
||||
run: |
|
||||
git push origin update --force
|
||||
|
||||
URL="${{ gitea.server_url }}"
|
||||
REPO_OWNER_SLASH_NAME="${{ gitea.repository }}"
|
||||
|
||||
if ! git ls-remote --exit-code origin update; then
|
||||
git push origin update --force
|
||||
PRS=$(curl -s -X GET -H "Authorization: token $PAT" \
|
||||
-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" \
|
||||
-d '{"title":"update","body":"automatic update","head":"update","base":"main"}' \
|
||||
"https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls")
|
||||
|
||||
PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
|
||||
"$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls")
|
||||
PR_NUMBER=$(echo "$PR_CREATE" | jq -r '.number')
|
||||
|
||||
curl -s -X POST -H "Authorization: token $PAT" \
|
||||
-H "Content-Type: application/json" \
|
||||
-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"
|
||||
|
||||
else
|
||||
git push origin update --force
|
||||
"$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/$PR_NUMBER/merge"
|
||||
fi
|
||||
|
52
.github/workflows/check.yaml
vendored
52
.github/workflows/check.yaml
vendored
@ -5,7 +5,6 @@ on:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
types: [opened, reopened, edited, auto_merge_enabled]
|
||||
|
||||
jobs:
|
||||
check:
|
||||
@ -16,8 +15,51 @@ jobs:
|
||||
contains(github.event.head_commit.message, 'Merge pull request') == false
|
||||
steps:
|
||||
- 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
|
||||
|
76
.github/workflows/release.yaml
vendored
76
.github/workflows/release.yaml
vendored
@ -14,9 +14,17 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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
|
||||
|
||||
@ -49,9 +57,17 @@ jobs:
|
||||
needs: release
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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
|
||||
with:
|
||||
@ -65,9 +81,51 @@ jobs:
|
||||
nix build .#trevstack-linux-arm64-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
|
||||
uses: ./.actions/push
|
||||
with:
|
||||
server_url: ${{ github.server_url }}
|
||||
repository: ${{ github.repository }}
|
||||
tag: ${{ github.ref_name }}
|
||||
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
|
||||
|
12
.github/workflows/update.yaml
vendored
12
.github/workflows/update.yaml
vendored
@ -14,9 +14,17 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./.actions/init
|
||||
|
||||
- name: Install nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
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
|
||||
- name: Set git config
|
||||
|
@ -5,13 +5,14 @@ updated=false
|
||||
|
||||
echo "updating nix flake"
|
||||
cd "${git_root}"
|
||||
nix flake update
|
||||
nix flake update --accept-flake-config
|
||||
if ! git diff --exit-code flake.lock; then
|
||||
git add flake.lock
|
||||
git commit -m "build(nix): updated nix dependencies"
|
||||
fi
|
||||
|
||||
echo "updating protobuf deps"
|
||||
cd "${git_root}/proto"
|
||||
buf dep update
|
||||
if ! git diff --exit-code buf.lock; then
|
||||
git add buf.lock
|
||||
|
2591
client/package-lock.json
generated
2591
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "trevstack",
|
||||
"private": true,
|
||||
"version": "0.0.46",
|
||||
"version": "0.0.47",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
@ -17,35 +17,35 @@
|
||||
"@bufbuild/protovalidate": "^0.1.1",
|
||||
"@connectrpc/connect": "^2.0.2",
|
||||
"@connectrpc/connect-web": "^2.0.2",
|
||||
"@eslint/compat": "^1.2.9",
|
||||
"@eslint/compat": "^1.3.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",
|
||||
"@scalar/api-reference": "^1.28.33",
|
||||
"@scalar/api-reference": "^1.31.11",
|
||||
"@simplewebauthn/browser": "^13.1.0",
|
||||
"@sveltejs/adapter-static": "^3.0.8",
|
||||
"@sveltejs/kit": "^2.21.0",
|
||||
"@sveltejs/vite-plugin-svelte": "^5.0.3",
|
||||
"@tailwindcss/vite": "^4.1.6",
|
||||
"bits-ui": "^1.4.8",
|
||||
"@sveltejs/kit": "^2.21.5",
|
||||
"@sveltejs/vite-plugin-svelte": "^5.1.0",
|
||||
"@tailwindcss/vite": "^4.1.10",
|
||||
"bits-ui": "^1.8.0",
|
||||
"clsx": "^2.1.1",
|
||||
"eslint": "^9.26.0",
|
||||
"eslint": "^9.29.0",
|
||||
"eslint-config-prettier": "^10.1.5",
|
||||
"eslint-plugin-svelte": "^3.6.0",
|
||||
"globals": "^16.1.0",
|
||||
"mode-watcher": "^1.0.7",
|
||||
"eslint-plugin-svelte": "^3.9.2",
|
||||
"globals": "^16.2.0",
|
||||
"mode-watcher": "^1.0.8",
|
||||
"prettier": "^3.5.3",
|
||||
"prettier-plugin-svelte": "^3.3.3",
|
||||
"prettier-plugin-tailwindcss": "^0.6.11",
|
||||
"svelte": "^5.28.6",
|
||||
"svelte-check": "^4.1.7",
|
||||
"prettier-plugin-svelte": "^3.4.0",
|
||||
"prettier-plugin-tailwindcss": "^0.6.12",
|
||||
"svelte": "^5.34.3",
|
||||
"svelte-check": "^4.2.1",
|
||||
"svelte-sonner": "^0.3.28",
|
||||
"tailwind-merge": "^3.3.0",
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwind-variants": "^1.0.0",
|
||||
"tailwindcss": "^4.0.13",
|
||||
"tw-animate-css": "^1.2.9",
|
||||
"tw-animate-css": "^1.3.4",
|
||||
"typescript": "^5.8.3",
|
||||
"typescript-eslint": "^8.32.1",
|
||||
"typescript-eslint": "^8.34.1",
|
||||
"vite": "^6.3.5"
|
||||
}
|
||||
}
|
||||
|
6
flake.lock
generated
6
flake.lock
generated
@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"lastModified": 1749794982,
|
||||
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -21,7 +21,7 @@
|
||||
...
|
||||
}: let
|
||||
pname = "trevstack";
|
||||
version = "0.0.46";
|
||||
version = "0.0.47";
|
||||
|
||||
build-systems = [
|
||||
"x86_64-linux"
|
||||
@ -130,7 +130,7 @@
|
||||
pname = "check-client";
|
||||
inherit version;
|
||||
src = ./client;
|
||||
npmDepsHash = "sha256-s87mYmEO8gJNAPSnC8U+jV+Gc86iFGq2oJaGbK8AbhQ=";
|
||||
npmDepsHash = "sha256-2c1s0CFR3aWZPq/cO7dtF6ri+XEFdkmjAietktaC9Y0=";
|
||||
dontNpmInstall = true;
|
||||
|
||||
buildPhase = ''
|
||||
@ -193,7 +193,7 @@
|
||||
client = pkgs.buildNpmPackage {
|
||||
inherit pname version;
|
||||
src = ./client;
|
||||
npmDepsHash = "sha256-s87mYmEO8gJNAPSnC8U+jV+Gc86iFGq2oJaGbK8AbhQ=";
|
||||
npmDepsHash = "sha256-2c1s0CFR3aWZPq/cO7dtF6ri+XEFdkmjAietktaC9Y0=";
|
||||
|
||||
installPhase = ''
|
||||
cp -r build "$out"
|
||||
|
@ -3,7 +3,7 @@ servers:
|
||||
- url: /grpc
|
||||
info:
|
||||
title: Trevstack API
|
||||
version: 0.0.46
|
||||
version: 0.0.47
|
||||
description: API for Trevstack
|
||||
contact:
|
||||
name: Trev
|
||||
|
@ -2,5 +2,5 @@
|
||||
version: v2
|
||||
deps:
|
||||
- name: buf.build/bufbuild/protovalidate
|
||||
commit: 8976f5be98c146529b1cc15cd2012b60
|
||||
digest: b5:5d513af91a439d9e78cacac0c9455c7cb885a8737d30405d0b91974fe05276d19c07a876a51a107213a3d01b83ecc912996cdad4cddf7231f91379079cf7488d
|
||||
commit: 9f2d3c737feb481a83375159c0733275
|
||||
digest: b5:19d3b83f7df2d284ff5935f4622d7f27e7464a93c210edb536e92a52bcc69b2a18da1312e96b5461601eba7b3764d5e90321bd62e6966870e7dbc2e4dedd98d6
|
||||
|
@ -12,8 +12,8 @@ import (
|
||||
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/interceptors"
|
||||
"github.com/spotdemo4/trevstack/server/internal/putil"
|
||||
"github.com/spotdemo4/trevstack/server/internal/sqlc"
|
||||
"github.com/spotdemo4/trevstack/server/internal/util"
|
||||
"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
|
||||
items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{
|
||||
UserID: userid,
|
||||
Name: util.NullLike(req.Msg.Filter),
|
||||
Start: util.NullTimestamp(req.Msg.Start),
|
||||
End: util.NullTimestamp(req.Msg.End),
|
||||
Name: putil.NullLike(req.Msg.Filter),
|
||||
Start: putil.NullTimestamp(req.Msg.Start),
|
||||
End: putil.NullTimestamp(req.Msg.End),
|
||||
Offset: int64(offset),
|
||||
Limit: int64(limit),
|
||||
})
|
||||
@ -97,9 +97,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
|
||||
// Get items count
|
||||
count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{
|
||||
UserID: userid,
|
||||
Name: util.NullLike(req.Msg.Filter),
|
||||
Start: util.NullTimestamp(req.Msg.Start),
|
||||
End: util.NullTimestamp(req.Msg.End),
|
||||
Name: putil.NullLike(req.Msg.Filter),
|
||||
Start: putil.NullTimestamp(req.Msg.Start),
|
||||
End: putil.NullTimestamp(req.Msg.End),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, connect.NewError(connect.CodeInternal, err)
|
||||
@ -157,8 +157,8 @@ func (h *Handler) UpdateItem(ctx context.Context, req *connect.Request[itemv1.Up
|
||||
// set
|
||||
Name: req.Msg.Name,
|
||||
Description: req.Msg.Description,
|
||||
Price: util.NullFloat64(req.Msg.Price),
|
||||
Quantity: util.NullInt64(req.Msg.Quantity),
|
||||
Price: putil.NullFloat64(req.Msg.Price),
|
||||
Quantity: putil.NullInt64(req.Msg.Quantity),
|
||||
|
||||
// where
|
||||
ID: req.Msg.Id,
|
||||
|
@ -19,8 +19,8 @@ import (
|
||||
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/interceptors"
|
||||
"github.com/spotdemo4/trevstack/server/internal/putil"
|
||||
"github.com/spotdemo4/trevstack/server/internal/sqlc"
|
||||
"github.com/spotdemo4/trevstack/server/internal/util"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
@ -96,7 +96,7 @@ func (h *Handler) UpdatePassword(ctx context.Context, req *connect.Request[userv
|
||||
|
||||
// Update password
|
||||
err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{
|
||||
Password: util.ToPointer(string(hash)),
|
||||
Password: putil.ToPointer(string(hash)),
|
||||
ID: userid,
|
||||
})
|
||||
if err != nil {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package util
|
||||
package putil
|
||||
|
||||
func DerefOrEmpty[T any](val *T) T {
|
||||
if val == nil {
|
@ -1,4 +1,4 @@
|
||||
package util
|
||||
package putil
|
||||
|
||||
import (
|
||||
"fmt"
|
Reference in New Issue
Block a user