Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions .github/workflows/build-exes-impl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ jobs:
id: win_onefile
if: inputs.build_onefile == 'true'
working-directory: ${{ inputs.pyinstaller_dir }}
run: ./make.ps1 -ExeName "$env:EXE_NAME" -LogLevel "env:LOG_LEVEL" -BuildType 'onefile'
run: ./make.ps1 -ExeName "$env:EXE_NAME" -LogLevel "$env:LOG_LEVEL" -BuildType 'onefile'
env:
EXE_NAME: ${{ inputs.executable_name }}-${{ needs.status.outputs.version }}-win
LOG_LEVEL: ${{ inputs.logLevel }}
Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
run: |
poetry run $env:EXE_NAME data install-cache "$($env:EXE_NAME)-app-data-cache/data"
poetry run $env:EXE_NAME data --list
poetry run $env:EXE_NAME program install-cache "$(env:EXE_NAME)-app-data-cache/programs"
poetry run $env:EXE_NAME program install-cache "$($env:EXE_NAME)-app-data-cache/programs"
poetry run $env:EXE_NAME program --list

- name: Run test suite on the frozen app (file)
Expand All @@ -347,8 +347,8 @@ jobs:
EXE_FILE: ${{ inputs.pyinstaller_dir }}/dist/onefile/${{ inputs.executable_name }}-${{ needs.status.outputs.version }}-win.exe
ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
ARGS: ${{ inputs.unit_test_args }}
run: |
"$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
run: |
& "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS

- name: Run test suite on the frozen app (folder)
if: steps.win_onedir.outcome == 'success' && inputs.unit_tests == 'true'
Expand All @@ -360,7 +360,7 @@ jobs:
ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
ARGS: ${{ inputs.unit_test_args }}
run: |
"$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS
& "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS

- name: Run integration test suite on the frozen app (file) # tests are more likely to fail in the one-file build than the one-dir build, so just run integration tests with the one-file build
if: steps.win_onefile.outcome == 'success' && inputs.integration_tests == 'true'
Expand All @@ -372,7 +372,7 @@ jobs:
ENV_SRC: ${{ steps.configure_python_env.outputs.env_source_file }}
ARGS: ${{ inputs.integration_test_args }}
run: |
"$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS --integration
& "$env:EXE_FILE" test --with-env-source "$env:ENV_SRC" $env:ARGS --integration

macos:
name: Build macOS Executables
Expand Down Expand Up @@ -567,7 +567,7 @@ jobs:
with:
options: |
-v ${{ github.workspace }}:/home
-u $THE_USER
-u ${{ steps.user.outputs.user }}
--env HOME=/home
--env XDG_DATA_HOME=/home/.local/share
--env XDG_CACHE_HOME=/home/.cache
Expand Down Expand Up @@ -600,10 +600,10 @@ jobs:
cd ..

# install cache data
poetry run "$PYINST_DIR" data install-cache "${EXE_NAME}-app-data-cache/data"
poetry run "$PYINST_DIR" data --list
poetry run "$PYINST_DIR" program install-cache "${EXE_NAME}-app-data-cache/programs"
poetry run "$PYINST_DIR" program --list
poetry run "$EXE_NAME" data install-cache "${EXE_NAME}-app-data-cache/data"
poetry run "$EXE_NAME" data --list
poetry run "$EXE_NAME" program install-cache "${EXE_NAME}-app-data-cache/programs"
poetry run "$EXE_NAME" program --list

export PYTHONUNBUFFERED=ok
if [ "$UNIT_TESTS" = "true" ]; then
Expand Down Expand Up @@ -636,6 +636,7 @@ jobs:
options: |
-v ${{ github.workspace }}:/home
--env GH_TOKEN
--env UNIT_TESTS
--env EXE_NAME
--env LOG_LEVEL
--env PYINST_DIR
Expand Down Expand Up @@ -674,6 +675,7 @@ jobs:
env:
PYINST_DIR: ${{ inputs.pyinstaller_dir }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
UNIT_TESTS: ${{ inputs.unit_tests }}
EXE_NAME: ${{ inputs.executable_name }}
LOG_LEVEL: ${{ inputs.logLevel }}
VER: ${{ needs.status.outputs.version }}
Expand Down
Loading