2 Commits

Author SHA1 Message Date
43fc67ded6 bump: v0.0.42 -> v0.0.43
Some checks failed
Check / check (push) Has been skipped
Release / check (push) Failing after 0s
Release / release (push) Has been skipped
Release / package (push) Has been skipped
2025-05-17 02:30:43 -04:00
8e7781a346 style: use better env
Some checks failed
Check / check (push) Failing after 0s
2025-05-17 02:29:04 -04:00
5 changed files with 29 additions and 34 deletions

View File

@ -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
@ -112,32 +108,31 @@ jobs:
- name: Push Images - name: Push Images
run: | run: |
docker image tag trevstack:${VERSION}-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 trevstack:${VERSION}-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 trevstack:${VERSION}-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}/${NAME} ${REGISTRY}/${NAME}-amd64 --arch amd64 docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 --arch amd64
docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm64 --arch arm64 docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 --arch arm64
docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm --arch arm docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:$VERSION $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm --arch arm
docker manifest push $REGISTRY/$GITHUB_REPOSITORY:$VERSION
docker manifest create ${REGISTRY}/${REPOSITORY}:latest \ docker manifest create $REGISTRY/$GITHUB_REPOSITORY:latest \
${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}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-amd64 --arch amd64 docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-amd64 --arch amd64
docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm64 --arch arm64 docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm64 --arch arm64
docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm --arch arm docker manifest annotate $REGISTRY/$GITHUB_REPOSITORY:latest $REGISTRY/$GITHUB_REPOSITORY:$VERSION-arm --arch arm
docker manifest push $REGISTRY/$GITHUB_REPOSITORY:latest
docker manifest push ${REGISTRY}/${NAME}
docker manifest push ${REGISTRY}/${REPOSITORY}:latest

View File

@ -1,12 +1,12 @@
{ {
"name": "trevstack", "name": "trevstack",
"version": "0.0.42", "version": "0.0.43",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "trevstack", "name": "trevstack",
"version": "0.0.42", "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",

View File

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

View File

@ -21,7 +21,7 @@
... ...
}: let }: let
pname = "trevstack"; pname = "trevstack";
version = "0.0.42"; 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-mmKVf0hmLfI1cP76QuLNKFmjTV2Lf1TlbVIR/DULuWA="; 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-mmKVf0hmLfI1cP76QuLNKFmjTV2Lf1TlbVIR/DULuWA="; npmDepsHash = "sha256-vgOTish91m4iVNCMuLfFRpTGdyyVr+/g4Ex3PRWqqGI=";
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.42 version: 0.0.43
description: API for Trevstack description: API for Trevstack
contact: contact:
name: Trev name: Trev