Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
43fc67ded6 | |||
8e7781a346 | |||
68dd90048f | |||
7bf54bbd8c | |||
9fa5818860 | |||
77859b3d94 |
57
.github/workflows/release.yaml
vendored
57
.github/workflows/release.yaml
vendored
@ -88,13 +88,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
TAG=${{ github.ref_name }}
|
TAG=${{ github.ref_name }}
|
||||||
VERSION=${TAG#v}
|
VERSION=${TAG#v}
|
||||||
REPOSITORY=${{ github.repository }}
|
|
||||||
NAME="${REPOSITORY}:${VERSION}"
|
|
||||||
REGISTRY="ghcr.io"
|
REGISTRY="ghcr.io"
|
||||||
|
|
||||||
echo "VERSION=${VERSION}" >> $GITHUB_ENV
|
echo "VERSION=${VERSION}" >> $GITHUB_ENV
|
||||||
echo "REPOSITORY=${REPOSITORY}" >> $GITHUB_ENV
|
|
||||||
echo "NAME=${NAME}" >> $GITHUB_ENV
|
|
||||||
echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
|
echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
@ -106,40 +102,37 @@ jobs:
|
|||||||
|
|
||||||
- name: Build & Load Images
|
- name: Build & Load Images
|
||||||
run: |
|
run: |
|
||||||
nix build .#${REPOSITORY}-linux-amd64-image && ./result | docker load
|
nix build .#trevstack-linux-amd64-image && ./result | docker load
|
||||||
nix build .#${REPOSITORY}-linux-arm64-image && ./result | docker load
|
nix build .#trevstack-linux-arm64-image && ./result | docker load
|
||||||
nix build .#${REPOSITORY}-linux-arm-image && ./result | docker load
|
nix build .#trevstack-linux-arm-image && ./result | docker load
|
||||||
|
|
||||||
- name: Push Images
|
- name: Push Images
|
||||||
run: |
|
run: |
|
||||||
docker image tag ${NAME}-amd64 ${REGISTRY}/${NAME}-amd64
|
docker image tag trevstack:$VERSION-amd64 $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64
|
||||||
docker push ${REGISTRY}/${NAME}-amd64
|
docker push $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64
|
||||||
|
|
||||||
docker image tag ${NAME}-arm64 ${REGISTRY}/${NAME}-arm64
|
docker image tag trevstack:$VERSION-arm64 $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64
|
||||||
docker push ${REGISTRY}/${NAME}-arm64
|
docker push $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64
|
||||||
|
|
||||||
docker image tag ${NAME}-arm ${REGISTRY}/${NAME}-arm
|
docker image tag trevstack:$VERSION-arm $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm
|
||||||
docker push ${REGISTRY}/${NAME}-arm
|
docker push $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm
|
||||||
|
|
||||||
- name: Push Manifest
|
- name: Push Manifest
|
||||||
run: |
|
run: |
|
||||||
docker manifest create ${REGISTRY}/${NAME} \
|
docker manifest create $REGISTRY/$GITHUB_REPOSITORY:$VERSION \
|
||||||
${REGISTRY}/${NAME}-amd64 \
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 \
|
||||||
${REGISTRY}/${NAME}-arm64 \
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 \
|
||||||
${REGISTRY}/${NAME}-arm
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm
|
||||||
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 --arch amd64
|
||||||
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 --arch arm64
|
||||||
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm --arch arm
|
||||||
|
docker manifest push $REGISTRY/$GITHUB_REPOSITORY:$VERSION
|
||||||
|
|
||||||
docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-amd64 --arch amd64
|
docker manifest create $REGISTRY/$GITHUB_REPOSITORY:latest \
|
||||||
docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm64 --arch arm64
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 \
|
||||||
docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm --arch arm
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 \
|
||||||
|
$REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm
|
||||||
docker manifest create ${REGISTRY}/${REPOSITORY}:latest \
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 --arch amd64
|
||||||
${REGISTRY}/${NAME}-amd64 \
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 --arch arm64
|
||||||
${REGISTRY}/${NAME}-arm64 \
|
docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm --arch arm
|
||||||
${REGISTRY}/${NAME}-arm
|
docker manifest push $REGISTRY/$GITHUB_REPOSITORY:latest
|
||||||
|
|
||||||
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
|
|
||||||
|
4
client/package-lock.json
generated
4
client/package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"version": "0.0.40",
|
"version": "0.0.43",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"version": "0.0.40",
|
"version": "0.0.43",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@bufbuild/protovalidate": "^0.1.1",
|
"@bufbuild/protovalidate": "^0.1.1",
|
||||||
"@connectrpc/connect": "^2.0.2",
|
"@connectrpc/connect": "^2.0.2",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.40",
|
"version": "0.0.43",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
pname = "trevstack";
|
pname = "trevstack";
|
||||||
version = "0.0.40";
|
version = "0.0.43";
|
||||||
|
|
||||||
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-PJzc3lVd7vvX/zGN3GbtbnCYL3tiPsndMFkzhESVcJw=";
|
npmDepsHash = "sha256-vgOTish91m4iVNCMuLfFRpTGdyyVr+/g4Ex3PRWqqGI=";
|
||||||
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-PJzc3lVd7vvX/zGN3GbtbnCYL3tiPsndMFkzhESVcJw=";
|
npmDepsHash = "sha256-vgOTish91m4iVNCMuLfFRpTGdyyVr+/g4Ex3PRWqqGI=";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
cp -r build "$out"
|
cp -r build "$out"
|
||||||
|
@ -3,7 +3,7 @@ servers:
|
|||||||
- url: /grpc
|
- url: /grpc
|
||||||
info:
|
info:
|
||||||
title: Trevstack API
|
title: Trevstack API
|
||||||
version: 0.0.40
|
version: 0.0.43
|
||||||
description: API for Trevstack
|
description: API for Trevstack
|
||||||
contact:
|
contact:
|
||||||
name: Trev
|
name: Trev
|
||||||
|
Reference in New Issue
Block a user