From cf10cdba29927b3ffc74626eff638ba08d66ebb6 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 15:39:22 -0700 Subject: [PATCH 01/18] check wolfram engine installation --- .github/workflows/CI.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4d8719c..6db4c03 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,6 +16,8 @@ jobs: WOLFRAMINIT: -entitlement ${{ secrets.WOLFRAM_LICENSE_ENTITLEMENT_ID }} -pwfile !cloudlm.wolfram.com steps: - uses: actions/checkout@v2 + - name: "Check Wolfram Engine installation" + run: WolframKernel -version - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -40,7 +42,9 @@ jobs: echo 'Installing Wolfram Engine...' brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - + - name: "Check Wolfram Engine installation" + run: WolframKernel -version + - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -99,6 +103,12 @@ jobs: echo 'Installing Wolfram Engine...' Start-Process "msiexec.exe" -ArgumentList $MSIArguments -Wait -NoNewWindow echo 'Installed Wolfram Engine.' + + - name: "Check Wolfram Engine installation" + run: ${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel -version + env: + JULIA_WOLFRAM_DIR: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' + - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 From d532684a3cb22c8d08dafac2ab59971feec86c0f Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 15:57:39 -0700 Subject: [PATCH 02/18] fix paths --- .github/workflows/CI.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6db4c03..46c9c2f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,8 +43,7 @@ jobs: brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" - run: WolframKernel -version - + run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -105,7 +104,7 @@ jobs: echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" - run: ${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel -version + run: '"${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -version' env: JULIA_WOLFRAM_DIR: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' From 409aeeda057866efee2a2bcf72a23fd851b20375 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 16:08:36 -0700 Subject: [PATCH 03/18] debug --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 46c9c2f..61bcd26 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,7 +43,7 @@ jobs: brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" - run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' + run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKerne" -version' - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -106,7 +106,7 @@ jobs: - name: "Check Wolfram Engine installation" run: '"${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -version' env: - JULIA_WOLFRAM_DIR: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' + WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 6a178fed5519f112dac12f7a4cbfa4f394fca554 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 16:23:47 -0700 Subject: [PATCH 04/18] fix --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 61bcd26..6d8dc33 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,7 +43,7 @@ jobs: brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" - run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKerne" -version' + run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -105,6 +105,7 @@ jobs: - name: "Check Wolfram Engine installation" run: '"${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -version' + shell: cmd env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' From 346b31dc77d9700826d56d981e497539fb389bbf Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 21:27:26 -0700 Subject: [PATCH 05/18] back to powershell --- .github/workflows/CI.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6d8dc33..2916ef1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,8 +104,7 @@ jobs: echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" - run: '"${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -version' - shell: cmd + run: Start-Process "${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -ArgumentList '-version' -Wait -NoNewWindow env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' From ffedff09f8f1d42b53d234ec152b19466fb17d2b Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Sun, 10 Mar 2024 21:37:15 -0700 Subject: [PATCH 06/18] test shell --- .github/workflows/CI.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2916ef1..35d4c2a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,6 +18,11 @@ jobs: - uses: actions/checkout@v2 - name: "Check Wolfram Engine installation" run: WolframKernel -version + - name: "Test shell" + run: | + $Version + $LicenseExpirationDate + shell: WolframKernel - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -44,6 +49,12 @@ jobs: echo 'Installed Wolfram Engine.' - name: "Check Wolfram Engine installation" run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' + - name: "Test shell" + run: | + $Version + $LicenseExpirationDate + shell: WolframKernel + - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -108,6 +119,12 @@ jobs: env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' + - name: "Test shell" + run: | + $Version + $LicenseExpirationDate + shell: WolframKernel + - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 From 102c02917a22522c9b8370e9100778f9636b8bf5 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 21:15:15 -0700 Subject: [PATCH 07/18] fix custom shell --- .github/workflows/CI.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 35d4c2a..75139cd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -20,9 +20,9 @@ jobs: run: WolframKernel -version - name: "Test shell" run: | - $Version - $LicenseExpirationDate - shell: WolframKernel + Print["Version: ", $Version] + Print["License expiration: ", $LicenseExpirationDate] + shell: wolfram -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -51,9 +51,9 @@ jobs: run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' - name: "Test shell" run: | - $Version - $LicenseExpirationDate - shell: WolframKernel + Print["Version: ", $Version] + Print["License expiration: ", $LicenseExpirationDate] + shell: wolfram -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -121,9 +121,9 @@ jobs: - name: "Test shell" run: | - $Version - $LicenseExpirationDate - shell: WolframKernel + Print["Version: ", $Version] + Print["License expiration: ", $LicenseExpirationDate] + shell: wolfram -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 7183e3bbd29fbd6c95d01686ad4700cf6d8cbeae Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 21:19:19 -0700 Subject: [PATCH 08/18] use WolframKernel --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 75139cd..7a65fdd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,7 +22,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: wolfram -script {0} + shell: WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -53,7 +53,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: wolfram -script {0} + shell: WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -123,7 +123,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: wolfram -script {0} + shell: WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From f7c5885f93eb3df9d94f973e8efdfebb27695389 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 21:47:15 -0700 Subject: [PATCH 09/18] try --- .github/workflows/CI.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7a65fdd..83d73c2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -36,6 +36,7 @@ jobs: runs-on: macos-latest env: WOLFRAMINIT: -entitlement ${{ secrets.WOLFRAM_LICENSE_ENTITLEMENT_ID }} -pwfile !cloudlm.wolfram.com + WOLFRAMENGINE_EXECUTABLE_DIRECTORY: /Applications/Wolfram Engine.app/Contents/Resources/Wolfram Player.app/Contents/MacOS steps: - name: Check out repository uses: actions/checkout@v2 @@ -53,7 +54,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -noicon -script {0} + shell: ${{ WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}/WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -114,16 +115,11 @@ jobs: Start-Process "msiexec.exe" -ArgumentList $MSIArguments -Wait -NoNewWindow echo 'Installed Wolfram Engine.' - - name: "Check Wolfram Engine installation" - run: Start-Process "${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}\WolframKernel" -ArgumentList '-version' -Wait -NoNewWindow - env: - WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' - - name: "Test shell" run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -noicon -script {0} + shell: ${{ runner.temp }}/${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}/WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 41cad89e5732f3249ca5ca79d66c5e74ec6fd745 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 21:49:40 -0700 Subject: [PATCH 10/18] fix --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 83d73c2..3776089 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -54,7 +54,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: ${{ WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}/WolframKernel -noicon -script {0} + shell: ${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}/WolframKernel -noicon -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 481d4492c9df1ca3037bd272ffca33377e0711ed Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 21:56:34 -0700 Subject: [PATCH 11/18] fix PATH --- .github/workflows/CI.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3776089..a6b25bb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -54,7 +54,9 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: ${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}/WolframKernel -noicon -script {0} + shell: WolframKernel -noicon -script {0} + env: + PATH: "${{env.PATH }}:${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -119,7 +121,9 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: ${{ runner.temp }}/${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}/WolframKernel -noicon -script {0} + shell: WolframKernel -noicon -script {0} + env: + PATH: "${{env.PATH }};${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From c16dac0da22ab08ee147ecfba17c332a088fa89e Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 22:07:56 -0700 Subject: [PATCH 12/18] use GITHUB_PATH --- .github/workflows/CI.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a6b25bb..82c2cb9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,15 +48,15 @@ jobs: echo 'Installing Wolfram Engine...' brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - - name: "Check Wolfram Engine installation" - run: '"/Applications/Wolfram Engine.app/Contents/MacOS/WolframKernel" -version' + + - name: "Set PATH" + run: echo "${{ WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" >> $GITHUB_PATH + - name: "Test shell" run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] shell: WolframKernel -noicon -script {0} - env: - PATH: "${{env.PATH }}:${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -117,13 +117,16 @@ jobs: Start-Process "msiexec.exe" -ArgumentList $MSIArguments -Wait -NoNewWindow echo 'Installed Wolfram Engine.' + - name: Set PATH + env: + WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' + run: echo "${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: "Test shell" run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] shell: WolframKernel -noicon -script {0} - env: - PATH: "${{env.PATH }};${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 58b81592fe2c926adf52cfc1d7a484b34d5c8abf Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 22:08:31 -0700 Subject: [PATCH 13/18] fix --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 82c2cb9..a7cd267 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,7 @@ jobs: echo 'Installed Wolfram Engine.' - name: "Set PATH" - run: echo "${{ WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" >> $GITHUB_PATH + run: echo "${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" >> $GITHUB_PATH - name: "Test shell" run: | From fee696762e65e743323a3c7b8a26fbebf7fb24f2 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 22:13:03 -0700 Subject: [PATCH 14/18] try without -noicon --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a7cd267..d7ededb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,7 +22,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -noicon -script {0} + shell: WolframKernel -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -56,7 +56,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -noicon -script {0} + shell: WolframKernel -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -126,7 +126,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -noicon -script {0} + shell: WolframKernel -script {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 4e199ea7fc7971c2d26010444f086b9bf1741321 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 9 Apr 2024 22:16:35 -0700 Subject: [PATCH 15/18] try wolframscript --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d7ededb..ad9d623 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -126,7 +126,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -script {0} + shell: wolframscript -file {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 1228476d2374d1666f6979e953962fe56ff9e2d6 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Wed, 10 Apr 2024 21:25:48 -0700 Subject: [PATCH 16/18] no PATH --- .github/workflows/CI.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ad9d623..602dbde 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -37,6 +37,7 @@ jobs: env: WOLFRAMINIT: -entitlement ${{ secrets.WOLFRAM_LICENSE_ENTITLEMENT_ID }} -pwfile !cloudlm.wolfram.com WOLFRAMENGINE_EXECUTABLE_DIRECTORY: /Applications/Wolfram Engine.app/Contents/Resources/Wolfram Player.app/Contents/MacOS + WOLFRAMSCRIPT_EXECUTABLE: /Applications/Wolfram Engine.app/Contents/Resources/Wolfram Player.app/Contents/MacOS/wolframscript steps: - name: Check out repository uses: actions/checkout@v2 @@ -49,14 +50,11 @@ jobs: brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' - - name: "Set PATH" - run: echo "${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" >> $GITHUB_PATH - - name: "Test shell" run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -script {0} + shell: ${{ env.WOLFRAMSCRIPT_EXECUTABLE }} -file {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 From 4311b7c145db0d8a8a822001f4145086377e2915 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Wed, 10 Apr 2024 21:36:50 -0700 Subject: [PATCH 17/18] print log info on windows --- .github/workflows/CI.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 602dbde..277a978 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,7 +22,7 @@ jobs: run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: WolframKernel -script {0} + shell: wolframscript -file {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 @@ -50,11 +50,14 @@ jobs: brew install --cask wolfram-engine echo 'Installed Wolfram Engine.' + - name: "Set PATH" + run: echo "${{ env.WOLFRAMENGINE_EXECUTABLE_DIRECTORY }}" >> $GITHUB_PATH + - name: "Test shell" run: | Print["Version: ", $Version] Print["License expiration: ", $LicenseExpirationDate] - shell: ${{ env.WOLFRAMSCRIPT_EXECUTABLE }} -file {0} + shell: wolframscript -file {0} - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 @@ -69,7 +72,7 @@ jobs: runs-on: windows-latest env: WOLFRAM_SYSTEM_ID: Windows-x86-64 - WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/13.0.0.0/WolframEngine_13.0.0_WIN.msi + WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/14.0.0.0/WolframEngine_14.0.0_WIN.msi WOLFRAMENGINE_CACHE_KEY: WolframEngine-A WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY: WolframEngine WOLFRAMINIT: -entitlement ${{ secrets.WOLFRAM_LICENSE_ENTITLEMENT_ID }} -pwfile !cloudlm.wolfram.com @@ -112,7 +115,10 @@ jobs: $logFile ) echo 'Installing Wolfram Engine...' - Start-Process "msiexec.exe" -ArgumentList $MSIArguments -Wait -NoNewWindow + $procMain = Start-Process "msiexec.exe" -ArgumentList $MSIArguments -NoNewWindow -PassThru + $procLog = Start-Process "powershell" "Get-Content -Path `"$logFile`" -Wait" -NoNewWindow -PassThru + $procMain.WaitForExit() + $procLog.Kill() echo 'Installed Wolfram Engine.' - name: Set PATH From e27c1044f13db1529360392926911bc1fc611088 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Wed, 10 Apr 2024 21:46:40 -0700 Subject: [PATCH 18/18] cleanup slightly --- .github/workflows/CI.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 277a978..dd60078 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -94,24 +94,22 @@ jobs: env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\${{ env.WOLFRAMENGINE_INSTALLATION_SUBDIRECTORY }}' WOLFRAMENGINE_INSTALL_MSI_PATH: '${{ runner.temp }}\WolframEngine-Install.msi' - WOLFRAMENGINE_INSTALL_LOG_PATH: '${{ runner.temp }}\WolframEngine-Install.log' run: | echo 'Downloading Wolfram Engine installer...' $msiFile = '${{ env.WOLFRAMENGINE_INSTALL_MSI_PATH }}' - $logFile = '${{ env.WOLFRAMENGINE_INSTALL_LOG_PATH }}' + $logFile = 'WolframEngine-Install.log' Import-Module BitsTransfer Start-BitsTransfer '${{ env.WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL }}' $msiFile echo 'Downloaded Wolfram Engine installer.' - $DataStamp = get-date -Format yyyyMMddTHHmmss $MSIArguments = @( "/i" ('"{0}"' -f $msiFile) 'INSTALLLOCATION="${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }}"' "/qn" "/norestart" - "/L*v" + "/l*" $logFile ) echo 'Installing Wolfram Engine...'