Fix Linux release (#225)

rename dockerfiles, add scripting to justfile, remove docker build scripts modify justfile for linux dep install to use sudo if available
iamdb · Nov 18, 2023 · f061ea8 · f061ea8
1 parent f453921
commit f061ea8
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/pull-request-linux.yml b/.github/workflows/pull-request-linux.yml
@@ -11,6 +11,8 @@ on:
       - "**.ts"
     branches:
       - main
+env:
+  CLICOLOR_FORCE: 1
 jobs:
   pre-merge:
     name: Pre-merge checks

diff --git a/.github/workflows/pull-request-macos.yml b/.github/workflows/pull-request-macos.yml
@@ -11,6 +11,8 @@ on:
       - "**.ts"
     branches:
       - main
+env:
+  CLICOLOR_FORCE: 1
 jobs:
   pre-merge:
     name: Pre-merge checks

diff --git a/Dockerfile.arm64 → Dockerfile.aarch64 b/Dockerfile.arm64 → Dockerfile.aarch64
diff --git a/Dockerfile → Dockerfile.x86_64 b/Dockerfile → Dockerfile.x86_64
diff --git a/build_arm64.sh b/build_arm64.sh
diff --git a/build_linux.sh b/build_linux.sh
diff --git a/justfile b/justfile
@@ -21,6 +21,10 @@ detected_target := if os() == "linux" {
 default:
   @just --list
 
+docker-build-linux arch=arch():
+  docker build -f Dockerfile.{{arch}} -t hifirs .
+  docker cp $(docker create hifirs:latest):hifi-rs .
+
 build-player target=detected_target $DATABASE_URL="sqlite:///tmp/data.db":
   just install-deps {{target}}
   just build-www
@@ -85,12 +89,18 @@ check-deps:
 install-deps-linux-x86_64:
   #!/usr/bin/env sh
   echo Installing dependencies for x86_64-unknown-linux-gnu
+  sudo_cmd=''
+
+  if [ -x "$(command -v sudo)" ]; then
+    sudo_cmd='sudo '
+  fi
+
   if [ -x "$(command -v apt-get)" ]; then
-    apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev nodejs npm
+    eval $sudo_cmd apt-get update && DEBIAN_FRONTEND=noninteractive $sudo_cmd apt-get install -qq libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev nodejs npm
   elif [ -x "$(command -v pacman)" ]; then
-    sudo pacman -S gstreamer gst-plugins-base-libs nodejs
+    eval $sudo_cmd pacman -S gstreamer gst-plugins-base-libs nodejs
   elif [ -x "$(command -v dnf)" ]; then
-    dnf install gstreamer1-devel gstreamer1-plugins-base-devel nodejs18
+    eval $sudo_cmd dnf install gstreamer1-devel gstreamer1-plugins-base-devel nodejs18
   else
     echo "distro not supported for x86_64-unknown-linux-gnu"
     exit 1
@@ -100,9 +110,15 @@ install-deps-linux-x86_64:
 install-deps-linux-aarch64:
   #!/usr/bin/env sh
   echo Installing dependencies for aarch64-unknown-linux-gnu
+  sudo_cmd=''
+
+  if [ -x "$(command -v sudo)" ]; then
+    sudo_cmd='sudo '
+  fi
+
   if [ -x "$(command -v apt-get)" ]; then
-    dpkg --add-architecture arm64
-    apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq install curl libgstreamer1.0-dev:arm64 g++-aarch64-linux-gnu libc6-dev-arm64-cross libglib2.0-dev:arm64 nodejs npm
+    eval $sudo_cmd dpkg --add-architecture arm64
+    eval $sudo_cmd apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq install curl libgstreamer1.0-dev:arm64 g++-aarch64-linux-gnu libc6-dev-arm64-cross libglib2.0-dev:arm64 nodejs npm
   else
     echo "distro not supported for aarch64-unknown-linux-gnu"
     exit 1