Skip to content

Commit

Permalink
Fix: wait for windows app as well (#15)
Browse files Browse the repository at this point in the history
* fix: wait for windows app as well
  • Loading branch information
kiennq authored Nov 3, 2024
1 parent 0e99827 commit 3abd108
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- cron: "0 0 * * 0" # weekly
workflow_dispatch:
push:
branches:
- main
paths:
- 'version'

Expand All @@ -25,7 +27,7 @@ jobs:
install: >-
zip
ninja
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get latest release
continue-on-error: true
Expand All @@ -39,10 +41,10 @@ jobs:
run: |
base_ver=$(cat version)
sha=${GITHUB_SHA::7}
version=$([ -z "${{ github.event.schedule }}" ] && echo ${base_ver} || echo ${base_ver}.$sha)
prerelease=$([[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]] && echo true || echo false)
version=$([[ $prerelease == true ]] && echo ${base_ver}.$sha || echo ${base_ver})
cur_ver=$([[ ${{ steps.cur_release.outcome }} == failure ]] && echo v0 || echo ${{ steps.cur_release.outputs.release }})
[[ v$version == $cur_ver ]] && exit 1
prerelease=$([ -z "${{ github.event.schedule }}" ] && echo false || echo true)
echo "version=$version" >> $GITHUB_ENV
echo "prerelease=$prerelease" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion shim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ int wmain(int argc, wchar_t* argv[])
SetInformationJobObject(jobHandle.get(), JobObjectExtendedLimitInformation, &jeli, sizeof(jeli));

auto [processHandle, threadHandle] = MakeProcess({path, args});
if (processHandle && !isWindowsApp)
if (processHandle)
{
AssignProcessToJobObject(jobHandle.get(), processHandle.get());

Expand Down

0 comments on commit 3abd108

Please sign in to comment.