From 5534e85a129b73506eff24bc57d91527856e6a44 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Tue, 3 Jun 2025 20:03:50 -0700 Subject: [PATCH 1/6] IN medley script, remove forcing wsl1 to use vnc --- scripts/medley/medley.command | 6 ------ scripts/medley/medley_args.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/scripts/medley/medley.command b/scripts/medley/medley.command index 28ce293f7..d3b3ab681 100755 --- a/scripts/medley/medley.command +++ b/scripts/medley/medley.command @@ -1002,12 +1002,6 @@ do shift done -# if running on WSL1, force use_vnc -if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ] -then - use_vnc=true -fi - # Process run_id # if it doesn't end in #, make sure that there is not another instance currently running with this same id diff --git a/scripts/medley/medley_args.sh b/scripts/medley/medley_args.sh index eac7baa0e..4d4505c27 100755 --- a/scripts/medley/medley_args.sh +++ b/scripts/medley/medley_args.sh @@ -412,9 +412,3 @@ do shift done -# if running on WSL1, force use_vnc -if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ] -then - use_vnc=true -fi - From e09feb7b6a856f8e15963c69abb0dc9721cad286 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 4 Jun 2025 11:15:39 -0700 Subject: [PATCH 2/6] Update buildLoadup workflow to handle new wsl1 maiko package. Actual work is in installers/deb/build_deb.sh. THere will now be wsl1 and wsl2 packages instead of just wsl packages. --- installers/deb/build_deb.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/installers/deb/build_deb.sh b/installers/deb/build_deb.sh index 78d45bc9c..dbb6cd48b 100755 --- a/installers/deb/build_deb.sh +++ b/installers/deb/build_deb.sh @@ -71,14 +71,17 @@ popd >/dev/null 2>/dev/null # For linux and wsl create packages for each arch -for wslp in linux wsl +for wslp in linux wsl2 wsl1 do # For each arch create a deb file for arch_base in x86_64^amd64 armv7l^armhf aarch64^arm64 do - if [[ ${wslp} = wsl && ${arch_base} = armv7l^armhf ]]; + if [ "${arch_base}" = armv7l^armhf ] then - continue + if [ "${wslp}" = wsl1 ] || [ "${wslp}" = wsl2 ] + then + continue + fi fi arch=${arch_base%^*} debian_arch=${arch_base#*^} @@ -99,8 +102,14 @@ do MEDLEYDIR=${il_dir#${pkg_dir}}/medley # Maiko and Medley files to il_dir (/usr/local/interlisp) mkdir -p ${il_dir} - tar -x -z -C ${il_dir} \ - -f "${tarball_dir}/maiko-${maiko_release}-linux.${arch}.tgz" + if [ "${wslp}" = wsl1 ] + then + tar -x -z -C ${il_dir} \ + -f "${tarball_dir}/maiko-${maiko_release}-wsl1.${arch}.tgz" + else + tar -x -z -C ${il_dir} \ + -f "${tarball_dir}/maiko-${maiko_release}-linux.${arch}.tgz" + fi tar -x -z -C ${il_dir} \ -f "${tarball_dir}/medley-${medley_release}-runtime.tgz" tar -x -z -C ${il_dir} \ @@ -117,14 +126,17 @@ do sed -e "s>--MEDLEYDIR-->${MEDLEYDIR}>g" ${pkg_dir}/DEBIAN/postrm chmod +x ${pkg_dir}/DEBIAN/postrm # For wsl scripts, include the vncviewer.exe - if [[ ${wslp} = wsl && ${arch} = x86_64 ]]; + if [ "${wslp}" = wsl1 ] || [ "${wslp}" = wsl2 ] then - pushd ./tmp >/dev/null - rm -rf vncviewer64-1.12.0.exe - wget -q https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe - popd >/dev/null - mkdir -p ${il_dir}/wsl - cp -p tmp/vncviewer64-1.12.0.exe ${il_dir}/wsl/vncviewer64-1.12.0.exe + if [ "${arch}" = x86_64 ] + then + pushd ./tmp >/dev/null + rm -rf vncviewer64-1.12.0.exe + wget -q https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe + popd >/dev/null + mkdir -p ${il_dir}/wsl + cp -p tmp/vncviewer64-1.12.0.exe ${il_dir}/wsl/vncviewer64-1.12.0.exe + fi fi # # Make sure all files are owned by root From e686790bc14d54bf311f99c6ce7ef194e577f0d3 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 4 Jun 2025 12:06:41 -0700 Subject: [PATCH 3/6] Fixing up control files for wsl in making of debs --- .github/workflows/buildLoadup.yml | 24 +++++++++++--------- installers/deb/{control-wsl => control-wsl1} | 0 installers/deb/control-wsl2 | 9 ++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) rename installers/deb/{control-wsl => control-wsl1} (100%) create mode 100644 installers/deb/control-wsl2 diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index 537851886..f4162ee48 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -336,10 +336,10 @@ jobs: runs-on: macos-14 needs: [sentry, loadup] - if: | - needs.sentry.outputs.release_not_built == 'true' - || inputs.force == 'true' -# if: false +# if: | +# needs.sentry.outputs.release_not_built == 'true' +# || inputs.force == 'true' + if: false defaults: run: @@ -407,9 +407,10 @@ jobs: runs-on: windows-2022 needs: [sentry, loadup, linux_installer] - if: | - needs.sentry.outputs.release_not_built == 'true' - || inputs.force == 'true' + if: false +# if: | +# needs.sentry.outputs.release_not_built == 'true' +# || inputs.force == 'true' outputs: cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }} @@ -510,9 +511,10 @@ jobs: runs-on: ubuntu-24.04 needs: [sentry, loadup, linux_installer, macos_installer, cygwin_installer] - if: | - needs.sentry.outputs.release_not_built == 'true' - || inputs.force == 'true' + if: false +# if: | +# needs.sentry.outputs.release_not_built == 'true' +# || inputs.force == 'true' steps: @@ -611,7 +613,7 @@ jobs: outputs: build_successful: ${{ steps.output.outputs.build_successful }} - needs: [sentry, loadup, downloads_page] + needs: [sentry, loadup] steps: # Delete the tarballs artifact diff --git a/installers/deb/control-wsl b/installers/deb/control-wsl1 similarity index 100% rename from installers/deb/control-wsl rename to installers/deb/control-wsl1 diff --git a/installers/deb/control-wsl2 b/installers/deb/control-wsl2 new file mode 100644 index 000000000..20f76b6eb --- /dev/null +++ b/installers/deb/control-wsl2 @@ -0,0 +1,9 @@ +Package: medley-interlisp +Version: 1.0.0 +Release: --RELEASE-- +Maintainer: info@interlisp.org +Description: Medley Interlisp for Linux +Homepage: https://github.com/interlisp/medley +Architecture: --ARCH-- +Depends: wslu ( >= 4.1 ) | wslu ( << 4.0 ), tigervnc-standalone-server, tigervnc-xorg-extension + From 96945e63e34f8830e7294d17bef88ece34f58bac Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 4 Jun 2025 12:12:57 -0700 Subject: [PATCH 4/6] Fix typo in buildLoadup.yml --- .github/workflows/buildLoadup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index f4162ee48..71e39a0bb 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -511,7 +511,7 @@ jobs: runs-on: ubuntu-24.04 needs: [sentry, loadup, linux_installer, macos_installer, cygwin_installer] - if: false + if: false # if: | # needs.sentry.outputs.release_not_built == 'true' # || inputs.force == 'true' From 90326613d1450000b119c317b64baeb194c83624 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 4 Jun 2025 12:33:00 -0700 Subject: [PATCH 5/6] Fix up testing version of buildLoadup.yml. Will be reverted to original after testing is done. --- .github/workflows/buildLoadup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index 71e39a0bb..4e119ece5 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -613,7 +613,7 @@ jobs: outputs: build_successful: ${{ steps.output.outputs.build_successful }} - needs: [sentry, loadup] + needs: [sentry, loadup, linux_installer] steps: # Delete the tarballs artifact From 145d2403463ef16ad58cdabd72bed70612229841 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 4 Jun 2025 16:56:45 -0700 Subject: [PATCH 6/6] Return buildLoadup.yml to its normal state after mods for testing --- .github/workflows/buildLoadup.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index 4e119ece5..537851886 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -336,10 +336,10 @@ jobs: runs-on: macos-14 needs: [sentry, loadup] -# if: | -# needs.sentry.outputs.release_not_built == 'true' -# || inputs.force == 'true' - if: false + if: | + needs.sentry.outputs.release_not_built == 'true' + || inputs.force == 'true' +# if: false defaults: run: @@ -407,10 +407,9 @@ jobs: runs-on: windows-2022 needs: [sentry, loadup, linux_installer] - if: false -# if: | -# needs.sentry.outputs.release_not_built == 'true' -# || inputs.force == 'true' + if: | + needs.sentry.outputs.release_not_built == 'true' + || inputs.force == 'true' outputs: cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }} @@ -511,10 +510,9 @@ jobs: runs-on: ubuntu-24.04 needs: [sentry, loadup, linux_installer, macos_installer, cygwin_installer] - if: false -# if: | -# needs.sentry.outputs.release_not_built == 'true' -# || inputs.force == 'true' + if: | + needs.sentry.outputs.release_not_built == 'true' + || inputs.force == 'true' steps: @@ -613,7 +611,7 @@ jobs: outputs: build_successful: ${{ steps.output.outputs.build_successful }} - needs: [sentry, loadup, linux_installer] + needs: [sentry, loadup, downloads_page] steps: # Delete the tarballs artifact