ci

alshdavid · May 21, 2024 · e38f663 · e38f663
1 parent b87dfd1
commit e38f663
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/actions/setup-env/generate.bash b/.github/actions/setup-env/generate.bash
@@ -1,7 +1,7 @@
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ROOT_DIR=$(dirname $(dirname $SCRIPT_DIR))
+ROOT_DIR=$(dirname $(dirname $(dirname $SCRIPT_DIR)))
 
 ls -l $ROOT_DIR
 cd $ROOT_DIR

diff --git a/.github/actions/setup-env/setup-env.bash b/.github/actions/setup-env/setup-env.bash
@@ -2,7 +2,7 @@
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ROOT_DIR=$(dirname $(dirname $SCRIPT_DIR))
+ROOT_DIR=$(dirname $(dirname $(dirname $SCRIPT_DIR)))
 
 cd $ROOT_DIR
 
@@ -24,7 +24,7 @@ ENV_PATH="${ROOT_DIR}/.env"
 
 if [ ! -f "$ENV_PATH" ]; then
   echo "missing ${ENV_PATH}"
-  exit 1
+  exit 0
 fi
 
 echo "Reading $ENV_PATH"

diff --git a/.github/actions/setup-env/setup-env.ps1 b/.github/actions/setup-env/setup-env.ps1
@@ -18,10 +18,15 @@ $env:Path = $HOME + '\.local\nodejs\prefix\bin;' + $env:Path
 $env:NPM_CONFIG_PREFIX = $HOME + '\.local\nodejs\prefix'
 pnpm config set store-dir $HOME/.local/nodejs/pnpm-store
 
-Get-Content "${env:RootPath}\.env" | foreach {
-  $name, $value = $_.split('=')
-  if ([string]::IsNullOrWhiteSpace($name) || $name.Contains('#')) {
-    continue
+if (Test-Path "${env:RootPath}\.env") {
+  echo "Loading .env"
+  Get-Content "${env:RootPath}\.env" | foreach {
+    $name, $value = $_.split('=')
+    if ([string]::IsNullOrWhiteSpace($name) || $name.Contains('#')) {
+      continue
+    }
+    echo "Setting $name = $value"
+    Set-Item "env:$name" "$value"
   }
-  Set-Item "env:$name" "$value"
 }
+