test setup-erlang windows support

erlware · May 22, 2020 · 769f427 · 769f427
1 parent b46d0ca
commit 769f427
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/wintest.yml b/.github/workflows/wintest.yml
@@ -17,13 +17,16 @@ jobs:
 
     strategy:
       matrix:
-        otp_version: [19, 20, 21, 22, 23]
+        otp_version: [19, 20, 22, 23]
         os: [windows-latest]
 
     steps:
     - uses: actions/checkout@v2
-    - name: Install Erlang
-      run: shelltests/win-install-erl.ps1 ${{ matrix.otp_version }}
+    - uses: reganheath/setup-erlang@add-windows-support
+      with:
+        otp-version: ${{ matrix.otp_version }}
+    # - name: Install Erlang
+    #   run: shelltests/win-install-erl.ps1 ${{ matrix.otp_version }}
       id: install_erlang
     - name: Run test
       run: shelltests/wintest.ps1 "${{ steps.install_erlang.outputs.erlpath }}"
diff --git a/priv/templates/extended_bin_windows_ps b/priv/templates/extended_bin_windows_ps
@@ -393,6 +393,9 @@ function Eval()
 
 # Ping node and error (exit) if not running
 function PingOrExit() {
+    "erl.exe is in $((Get-Command erl).source)"
+    Eval "io:format(`"~s`", [filename:nativename(code:root_dir())])."
+    Eval "os:find_executable(epmd)."
     $result = (Rpc erlang is_alive)
     if ($result -ne "true") {
         Write-Error "Node is not running! ($result)"

diff --git a/shelltests/wintest.ps1 b/shelltests/wintest.ps1
@@ -16,7 +16,6 @@ $ErrorActionPreference = "Stop"
 # Add erlpath to PATH
 "*** Add to PATH $erlpath\bin"
 $env:PATH = "$env:PATH;$erlpath\bin"
-#$env:PATH = "$env:PATH;$erlpath\erts-$erts_vsn\bin"
 ""
 
 # CD to script location (shelltests)