Skip to content

Commit

Permalink
try more verbosity
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp committed Dec 19, 2023
1 parent 9feb8c5 commit 48a1576
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
- os: windows
python-version: "3.10"
conda-standalone: conda-standalone
# - os: windows
# python-version: "3.11"
# # conda-standalone: micromamba
# conda-standalone: conda-standalone-nightly
- os: windows
python-version: "3.11"
# conda-standalone: micromamba
conda-standalone: conda-standalone-nightly

env:
PYTHONUNBUFFERED: "1"
Expand Down Expand Up @@ -118,9 +118,9 @@ jobs:
conda activate constructor-dev
echo "CONSTRUCTOR_CONDA_EXE=$CONDA_PREFIX/standalone_conda/conda.exe" >> $GITHUB_ENV
fi
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
timeout-minutes: 60
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# timeout-minutes: 60
- name: Run unit tests
run: |
pytest -vv --cov=constructor --cov-branch tests/ -m "not examples"
Expand Down
3 changes: 1 addition & 2 deletions constructor/nsis/main.nsi.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,8 @@ SectionEnd
!macroend

Section "Uninstall"
System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_ROOT_PREFIX", "$INSTDIR")".r0'

# Remove menu items, path entries
System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_ROOT_PREFIX", "$INSTDIR")".r0'
SetDetailsPrint both
@UNINSTALL_MENUS@

Expand Down
12 changes: 9 additions & 3 deletions constructor/winexe.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,15 @@ def setup_envs_commands(info, dir_path):

def uninstall_menus_commands(info):
tmpl = r"""
DetailPrint "Deleting menus from {name}..."
nsExec::ExecToLog '"$INSTDIR\_conda.exe" constructor --prefix "{path}" --rm-menus'
"""
SetDetailsPrint
DetailPrint "Deleting @NAME@ menus in {name}..."
SetDetailsPrint listonly
push '"$INSTDIR\_conda.exe" constructor --prefix "{path}" --rm-menus'
push 'Failed to delete menus in {name}'
push 'WithLog'
call un.AbortRetryNSExecWait
SetDetailsPrint both
"""
lines = tmpl.format(name="base", path="$INSTDIR").splitlines()
for env_name in info.get("_extra_envs_info", {}):
path = join("$INSTDIR", "envs", env_name)
Expand Down

0 comments on commit 48a1576

Please sign in to comment.