Try again

optimumBA · Sep 17, 2024 · 87bf09b · 87bf09b
1 parent c59cc7f
commit 87bf09b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/github_workflows.ex b/.github/github_workflows.ex
@@ -433,8 +433,10 @@ defmodule GithubWorkflows do
               run: expect_install_command
             ],
             [
-              name: "Debug",
-              uses: "lhotari/action-upterm@v1"
+              # Avoid mise conflicts
+              name: "Remove .tool-versions file",
+              if: "steps.result_cache.outputs.cache-hit != 'true'",
+              run: "rm .tool-versions"
             ],
             [
               name: "Test the script",

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,8 +24,9 @@ jobs:
       - name: Install expect tool
         if: steps.result_cache.outputs.cache-hit != 'true'
         run: sudo apt-get update && sudo apt-get install -y expect
-      - name: Debug
-        uses: lhotari/action-upterm@v1
+      - name: Remove .tool-versions file
+        if: steps.result_cache.outputs.cache-hit != 'true'
+        run: rm .tool-versions
       - name: Test the script
         if: steps.result_cache.outputs.cache-hit != 'true'
         run: cd test/scripts && expect script.exp Linux.sh

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -28,8 +28,9 @@ jobs:
       - name: Install expect tool
         if: steps.result_cache.outputs.cache-hit != 'true'
         run: sudo apt-get update && sudo apt-get install -y expect
-      - name: Debug
-        uses: lhotari/action-upterm@v1
+      - name: Remove .tool-versions file
+        if: steps.result_cache.outputs.cache-hit != 'true'
+        run: rm .tool-versions
       - name: Test the script
         if: steps.result_cache.outputs.cache-hit != 'true'
         run: cd test/scripts && expect script.exp Linux.sh

diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh
@@ -80,8 +80,8 @@ function install() {
         ;;
     "mise")
         curl https://mise.run | sh
-        echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >>$config_file
-        export PATH="$HOME/.local/share/mise/shims:$PATH"
+        echo 'eval "$(~/.local/bin/mise activate '$current_shell')"' >>$config_file
+        eval "$(~/.local/bin/mise activate $current_shell)"
         ;;
     "Erlang")
         sudo apt-get update
@@ -105,9 +105,7 @@ function install() {
         sudo apt-get -y install linux-headers-generic build-essential libssl-dev libreadline-dev zlib1g-dev libcurl4-openssl-dev uuid-dev icu-devtools
         mise use -g postgres@$postgres_version
         postgres_bin_path="$HOME/.local/share/mise/installs/postgres/$postgres_version/bin"
-        export PATH="$postgres_bin_path:$PATH"
         echo "export PATH=\"$postgres_bin_path:\$PATH\"" >>$config_file
-        mise reshim
         ;;
     *)
         echo "Invalid name argument on install"

diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh
@@ -80,8 +80,8 @@ function install() {
         ;;
     "mise")
         curl https://mise.run | sh
-        echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >>$config_file
-        export PATH="$HOME/.local/share/mise/shims:$PATH"
+        echo 'eval "$(~/.local/bin/mise activate '$current_shell')"' >>$config_file
+        eval "$(~/.local/bin/mise activate $current_shell)"
         ;;
     "Erlang")
         brew install autoconf [email protected] wxwidgets libxslt fop