From 9aff16d9277b0f1abf72153df999677606232958 Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Fri, 13 Feb 2026 11:25:43 +0000 Subject: [PATCH 1/2] Unifies installer name format for all os --- .github/workflows/build_installer.yaml | 11 ++++++++--- packaging/linux/build_installer.sh | 4 ++-- packaging/macos/make.sh | 10 ++++++++-- packaging/windows/build_installer.nsi | 9 +++++++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_installer.yaml b/.github/workflows/build_installer.yaml index 541937b1..51ca897b 100644 --- a/.github/workflows/build_installer.yaml +++ b/.github/workflows/build_installer.yaml @@ -31,7 +31,12 @@ jobs: conda install -c nsis nsis=3.* accesscontrol pip install matlabengine==9.14.* python packaging/build_exe.py - makensis packaging/windows/build_installer.nsi + if ($env:GITHUB_REF_NAME -eq "main") { + makensis /DNIGHTLY packaging/windows/build_installer.nsi + } + else { + makensis packaging/windows/build_installer.nsi + } - name: Upload installer uses: actions/upload-artifact@v4 with: @@ -90,7 +95,7 @@ jobs: if [ ${{ matrix.platform }} == "macos-14" ]; then ARCH="arm64" export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/bin/maca64 - python -m pip install --no-build-isolation /Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/extern/engines/python + python -m pip install --no-build-isolation /Users/runner/hostedtoolcache/MATLAB/2023.2.999/arm64/MATLAB.app/extern/engines/python else ARCH="x64" export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/Users/runner/hostedtoolcache/MATLAB/2023.2.999/x64/MATLAB.app/bin/maci64 @@ -105,7 +110,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: macOS installer-${{ strategy.job-index }} - path: packaging/macos/rascal2-*.pkg + path: packaging/macos/RasCAL-2*.pkg deploy-nightly: if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest diff --git a/packaging/linux/build_installer.sh b/packaging/linux/build_installer.sh index dcfa7f2c..2c10dab8 100644 --- a/packaging/linux/build_installer.sh +++ b/packaging/linux/build_installer.sh @@ -151,9 +151,9 @@ chmod 777 "$STAGE_DIR/rascal/packaging/linux/install.sh" echo "" echo "Creating self-extracting archive" echo "" -EXECUTABLE="RasCAL-2-installer.run" +EXECUTABLE="RasCAL-2-linux.run" if [ -n "$TAG" ]; then - EXECUTABLE="RasCAL-2-${TAG:1}-installer.run" + EXECUTABLE="RasCAL-2-${TAG:1}-linux.run" fi makeself --tar-format "posix" --tar-extra "--exclude=__pycache__ --exclude=.git --exclude=.github --exclude=rascal/doc --exclude=rascal/tests" "$STAGE_DIR" "$EXECUTABLE" "RasCAL-2 installer" ./rascal/packaging/linux/install.sh diff --git a/packaging/macos/make.sh b/packaging/macos/make.sh index 809dd985..91b50fc2 100644 --- a/packaging/macos/make.sh +++ b/packaging/macos/make.sh @@ -3,13 +3,19 @@ RASCAL_PATH="../bundle/rascal.app" VER_NAME=$1 ARCH_NAME=$2 -VER=$VER_NAME +VER="main" if [[ ${VER_NAME:0:1} == 'v' ]]; then VER=${VER:1} fi +if [[ ${VER} == 'main' ]]; then + NAME="RasCAL-2-macos-${ARCH_NAME}.pkg" +else + NAME="RasCAL-2-${VER}-macos-${ARCH_NAME}.pkg" +fi + # Build Pkg sed -e "s/@VERSION_NAME@/${VER_NAME}/g" -e "s/@VERSION@/${VER}/g" distribution.xml.in > distribution.xml pkgbuild --root ${RASCAL_PATH} --identifier com.rascal2.rascal.pkg --version ${VER} --install-location "/Applications/rascal.app" rascal.pkg -productbuild --distribution distribution.xml --resources . "rascal2-${VER}-${ARCH_NAME}.pkg" +productbuild --distribution distribution.xml --resources . ${NAME} diff --git a/packaging/windows/build_installer.nsi b/packaging/windows/build_installer.nsi index 2c8d15ab..e46cfd6e 100644 --- a/packaging/windows/build_installer.nsi +++ b/packaging/windows/build_installer.nsi @@ -11,11 +11,16 @@ Unicode true ;Define name of the product -!define PRODUCT "RasCAL 2" +!define PRODUCT "RasCAL-2" ;Name and file Name "${PRODUCT}" -OutFile "${PRODUCT}-${VERSION}-setup.exe" + +!ifdef NIGHTLY + OutFile "${PRODUCT}-windows.exe" +!else + OutFile "${PRODUCT}-${VERSION}-windows.exe" +!endif ;Default installation folder InstallDir "$PROGRAMFILES64\${PRODUCT}" From d5adbf9744039749108f00ffa5304dc09b49e03f Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Tue, 17 Feb 2026 10:17:35 +0000 Subject: [PATCH 2/2] Remove add_note --- rascal2/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rascal2/config.py b/rascal2/config.py index 0c8091bf..184c5aab 100644 --- a/rascal2/config.py +++ b/rascal2/config.py @@ -246,7 +246,9 @@ def get_matlab_path(self): ) except (FileNotFoundError, MatlabHelper.ConfigError) as ex: if isinstance(ex, FileNotFoundError): - ex.add_note("Matlab engine could not be found, ensure it is installed properly.") + ex = MatlabHelper.ConfigError( + "Matlab engine could not be found, ensure it is installed properly." + ).with_traceback(ex.__traceback__) self.engine_output[:] = [] self.engine_output.append(ex) LOGGER.error(f"Attempt to read MATLAB _arch file failed {MATLAB_ARCH_FILE}.\n {ex}.")