diff --git a/.github/github_workflows.ex b/.github/github_workflows.ex index e9cf1a0a..63cd3eae 100644 --- a/.github/github_workflows.ex +++ b/.github/github_workflows.ex @@ -441,7 +441,7 @@ defmodule GithubWorkflows do name: "Generate an app and start the server", if: "steps.result_cache.outputs.cache-hit != 'true'", run: - "source #{config_file} && SHELL=/bin/#{shell} make -f test/scripts/Makefile serve", + "/bin/#{shell} -c 'source #{config_file} && SHELL=/bin/#{shell} make -f test/scripts/Makefile serve'", shell: "/bin/#{shell} -l {0}" ], [ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0583dac..c6c39b81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: shell: /bin/bash -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve + run: /bin/bash -c 'source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve' shell: /bin/bash -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -64,7 +64,7 @@ jobs: shell: /bin/bash -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve + run: /bin/bash -c 'source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve' shell: /bin/bash -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -101,7 +101,7 @@ jobs: shell: /bin/zsh -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve + run: /bin/zsh -c 'source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve' shell: /bin/zsh -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -138,7 +138,7 @@ jobs: shell: /bin/zsh -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve + run: /bin/zsh -c 'source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve' shell: /bin/zsh -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 12635a99..7e98a6e7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: shell: /bin/bash -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve + run: /bin/bash -c 'source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve' shell: /bin/bash -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -68,7 +68,7 @@ jobs: shell: /bin/bash -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve + run: /bin/bash -c 'source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve' shell: /bin/bash -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -105,7 +105,7 @@ jobs: shell: /bin/zsh -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve + run: /bin/zsh -c 'source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve' shell: /bin/zsh -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' @@ -142,7 +142,7 @@ jobs: shell: /bin/zsh -l {0} - name: Generate an app and start the server if: steps.result_cache.outputs.cache-hit != 'true' - run: source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve + run: /bin/zsh -c 'source ~/.zshrc && SHELL=/bin/zsh make -f test/scripts/Makefile serve' shell: /bin/zsh -l {0} - name: Check HTTP status code if: steps.result_cache.outputs.cache-hit != 'true' diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh index a0797902..8c6b15ed 100755 --- a/priv/static/Linux.sh +++ b/priv/static/Linux.sh @@ -86,7 +86,9 @@ function install() { "Erlang") sudo apt-get update sudo apt-get -y install build-essential autoconf m4 libncurses5-dev libwxgtk3.0-gtk3-dev libwxgtk-webview3.0-gtk3-dev libgl1-mesa-dev libglu1-mesa-dev libpng-dev libssh-dev unixodbc-dev xsltproc fop libxml2-utils libncurses-dev openjdk-11-jdk - echo 'KERL_CONFIGURE_OPTIONS="--without-javac"' >>~/.kerlrc + if [ ! -f ~/.kerlrc ]; then + echo 'KERL_CONFIGURE_OPTIONS="--without-javac"' >~/.kerlrc + fi mise use -g erlang@$erlang_version mise reshim ;; @@ -167,7 +169,7 @@ phx_tools=" ██████╗░██╗░░██╗██╗░░██╗  ████████╗░█████╗░░█████╗░██╗░░░░░░██████╗  ██╔══██╗██║░░██║╚██╗██╔╝  ╚══██╔══╝██╔══██╗██╔══██╗██║░░░░░██╔════╝  ██████╔╝███████║░╚███╔╝░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░╚█████╗░  - ██╔═══╝░██╔══██║░██╔██╗░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░░╚═══██╗  + ██╔═══╝░██╔══██║���██╔██╗░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░░╚═══██╗  ██║░░░░░██║░░██║██╔╝╚██╗  ░░░██║░░░╚█████╔╝╚█████╔╝███████╗██████╔╝  ╚═╝░░░░░╚═╝░░╚═╝╚═╝░░╚═╝  ░░░╚═╝░░░░╚════╝░░╚════╝░╚══════╝╚═════╝░  " diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh index 65c7ead1..7a4df269 100755 --- a/priv/static/macOS.sh +++ b/priv/static/macOS.sh @@ -85,7 +85,9 @@ function install() { ;; "Erlang") brew install autoconf openssl@1.1 wxwidgets libxslt fop - echo 'KERL_CONFIGURE_OPTIONS="--without-javac" --with-ssl=$(brew --prefix openssl@1.1)"' >>~/.kerlrc + if [ ! -f ~/.kerlrc ]; then + echo 'KERL_CONFIGURE_OPTIONS="--without-javac"' >~/.kerlrc + fi mise use -g erlang@$erlang_version mise reshim ;; diff --git a/test/scripts/Makefile b/test/scripts/Makefile index 8a40a571..4b417a63 100644 --- a/test/scripts/Makefile +++ b/test/scripts/Makefile @@ -4,8 +4,11 @@ SHELL := $(shell echo $$SHELL) .SHELLFLAGS := -eu -c serve: - # initdb -D ~/pgdata -U postgres - # pg_ctl start -D ~/pgdata + eval "$(mise activate bash)" + mise activate --shims + mise reshim + initdb -D ~/pgdata -U postgres + pg_ctl start -D ~/pgdata mix phx.new --no-install phx_tools_test cd phx_tools_test && mix local.rebar --force && mix setup cd phx_tools_test && elixir --erl "-detached" -S mix phx.server