From d81e3fd42f99c28ee40ef134ddf5588eb1458d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Almir=20Saraj=C4=8Di=C4=87?= Date: Tue, 17 Sep 2024 20:14:47 +0200 Subject: [PATCH] Debug --- .github/github_workflows.ex | 10 +++++----- .github/workflows/main.yml | 3 +++ .github/workflows/pr.yml | 3 +++ priv/static/Linux.sh | 5 +---- priv/static/macOS.sh | 4 ++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/github_workflows.ex b/.github/github_workflows.ex index c9e2db99..6aeaf3e0 100644 --- a/.github/github_workflows.ex +++ b/.github/github_workflows.ex @@ -457,11 +457,11 @@ defmodule GithubWorkflows do run: run_command, shell: "/bin/#{shell} -l {0}" ], - # [ - # name: "Setup upterm session", - # uses: "lhotari/action-upterm@v1", - # if: "always()" - # ], + [ + name: "Setup upterm session", + uses: "lhotari/action-upterm@v1", + if: "always()" + ], [ name: "Check HTTP status code", if: "steps.result_cache.outputs.cache-hit != 'true'", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 449ec87f..b5c3ab9f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,9 @@ jobs: if: steps.result_cache.outputs.cache-hit != 'true' run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve shell: /bin/zsh -l {0} + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + if: always() - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' uses: nick-fields/retry@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fc6fe277..117e395a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -39,6 +39,9 @@ jobs: if: steps.result_cache.outputs.cache-hit != 'true' run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve shell: /bin/zsh -l {0} + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + if: always() - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' uses: nick-fields/retry@v2 diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh index dca68778..20071081 100755 --- a/priv/static/Linux.sh +++ b/priv/static/Linux.sh @@ -86,17 +86,15 @@ function install() { case $current_shell in "bash") echo 'eval "$(~/.local/bin/mise activate bash)"' >>$config_file - mise activate bash ;; "fish") echo '~/.local/bin/mise activate fish | source' >>$config_file - mise activate fish ;; "zsh") echo 'eval "$(~/.local/bin/mise activate zsh)"' >>$config_file - mise activate zsh ;; esac + mise activate $current_shell ;; "Erlang") sudo apt-get update @@ -115,7 +113,6 @@ function install() { mix archive.install --force hex phx_new $phoenix_version ;; "PostgreSQL") - echo "Debug installing postgres" sudo apt-get update sudo apt-get -y install linux-headers-generic build-essential libssl-dev libreadline-dev zlib1g-dev libcurl4-openssl-dev uuid-dev icu-devtools mise install postgres@$postgres_version diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh index 2cd5267d..f9d85d16 100755 --- a/priv/static/macOS.sh +++ b/priv/static/macOS.sh @@ -94,7 +94,7 @@ function install() { echo 'eval "$(~/.local/bin/mise activate zsh)"' >>$config_file ;; esac - source $config_file >/dev/null 2>&1 + mise activate $current_shell ;; "Erlang") brew install autoconf openssl@1.1 wxwidgets libxslt fop @@ -140,7 +140,7 @@ function add_env() { # echo "" # echo -e "${white}" # sleep 2 - # maybe_install "xcode" + # maybe_install "Xcode Command Line Tools" # echo -e "${white}" # sleep 2