1
0
Fork 0

update piped

This commit is contained in:
chaos 2023-09-27 21:45:01 +01:00
parent 76f688b1e6
commit 2a03d86df5
No known key found for this signature in database
5 changed files with 1537 additions and 1549 deletions

View file

@ -8,10 +8,10 @@ rm -rf result
mkdir result mkdir result
echo "Building Frontend" echo "Building Frontend"
nix build .#piped-frontend -o result/piped-frontend "$@" nix build -v .#piped-frontend -o result/piped-frontend "$@"
echo "Building Backend" echo "Building Backend"
nix build .#piped-backend -o result/piped-backend "$@" nix build -v .#piped-backend -o result/piped-backend "$@"
echo "Building Proxy" echo "Building Proxy"
nix build .#piped-proxy -o result/piped-proxy "$@" nix build -v .#piped-proxy -o result/piped-proxy "$@"

View file

@ -1,15 +1,15 @@
{ {
"frontend": { "frontend": {
"rev": "5ed66f04711fc69d6293bcdcca0690d69253a3dc", "rev": "42792d8ec4a24e9a85af5320a71a3a09e0ee941c",
"sha256": "sha256-Esz3cK/RMvBfV3g4d0iYqO9ixk+3Q+pQODZb8MRI+2E=" "sha256": "sha256-/iyHvUgV1doH0adB1jcXWj6zi30k8pmCa0RrAmHmmo8="
}, },
"backend": { "backend": {
"rev": "a8e6907305a2f2f29d88e6cd07a2d392ece922af", "rev": "af6325b53791ed4f82632ad0c8736c71f0736362",
"sha256": "sha256-QJPyz//CtJB5e7egrvemYh/hBjlN58QRpVb8KAJtSZ4=", "sha256": "sha256-VBl5FgHeYO4xrNNP/Yipf210rMJpgZwQFJMsLuEkuwQ=",
"deps-sha256": "sha256-CS6gu7U8loktSh5xLq98vnBFWHuuv9sLYmgAZtrdP4Y=" "deps-sha256": "sha256-hvrA+IdNFw60QGdf8OdNl+fOz0/EJORp0TSJhg+huSA="
}, },
"proxy": { "proxy": {
"rev": "60fc664f2ba47c8def8045b027eb4ddcd7a890fe", "rev": "884df6a08e4eacf9494be085f225770307d2c9d2",
"sha256": "sha256-nWfvSp7Nv9p0MlA4RZO7KIoCpeDdw1BcAyLOsP/quY8=" "sha256": "sha256-OkA6JVLPK6pog3cByCCAdfBOF5UOrtV4GoeLKGaYOWo="
} }
} }

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -16,7 +16,7 @@ json_set() {
# Frontend # Frontend
old_frontend_rev=$(json_get '.frontend.rev') old_frontend_rev=$(json_get '.frontend.rev')
new_frontend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped/commits" 2>/dev/null | jq ".[0].sha" -r) new_frontend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${UPDATE-}" == "frontend" ]; then
echo "Frontend is out of date. Updating..." echo "Frontend is out of date. Updating..."
json_set '.frontend.rev' "$new_frontend_rev" json_set '.frontend.rev' "$new_frontend_rev"
json_set '.frontend.sha256' "" json_set '.frontend.sha256' ""
@ -27,8 +27,8 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
pushd Piped pushd Piped
git reset --hard "$new_frontend_rev" git reset --hard "$new_frontend_rev"
#yarn install --no-lockfile #yarn install --no-lockfile
yarn add unocss@0.55.7 # yarn add unocss@0.56.4
yarn install --mode update-lockfile yarn install --mode update-lockfile
nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/packages/frontend/yarn.nix" nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/packages/frontend/yarn.nix"
cp yarn.lock "${BASE_DIR}/packages/frontend/yarn.lock" cp yarn.lock "${BASE_DIR}/packages/frontend/yarn.lock"
popd popd
@ -39,7 +39,7 @@ fi
# Backend # Backend
old_backend_rev=$(json_get '.backend.rev') old_backend_rev=$(json_get '.backend.rev')
new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r) new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_backend_rev" != "$old_backend_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then if [ "$new_backend_rev" != "$old_backend_rev" ] || [ "${FORCE_UPDATE-}" == "backend" ]; then
echo "Backend is out of date. Updating..." echo "Backend is out of date. Updating..."
json_set '.backend.rev' "$new_backend_rev" json_set '.backend.rev' "$new_backend_rev"
json_set '.backend.sha256' "" json_set '.backend.sha256' ""
@ -49,7 +49,7 @@ fi
# Proxy # Proxy
old_proxy_rev=$(json_get '.proxy.rev') old_proxy_rev=$(json_get '.proxy.rev')
new_proxy_rev=$(curl -L "https://api.github.com/repos/TeamPiped/piped-proxy/commits" 2>/dev/null | jq ".[0].sha" -r) new_proxy_rev=$(curl -L "https://api.github.com/repos/TeamPiped/piped-proxy/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_proxy_rev" != "$old_proxy_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then if [ "$new_proxy_rev" != "$old_proxy_rev" ] || [ "${FORCE_UPDATE-}" == "proxy" ]; then
echo "Proxy is out of date. Updating..." echo "Proxy is out of date. Updating..."
json_set '.proxy.rev' "$new_proxy_rev" json_set '.proxy.rev' "$new_proxy_rev"
json_set '.proxy.sha256' "" json_set '.proxy.sha256' ""