Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TestCI #4154

Open
wants to merge 4 commits into
base: experimental
Choose a base branch
from
Open

TestCI #4154

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

push:
branches: [ master ]
branches: [master, experimental]
paths-ignore:
# Case-sensitive paths to ignore on push events
- '.editorconfig'
Expand Down Expand Up @@ -35,7 +35,7 @@ on:
- '**/AUTHORS'
- '**/COPYING'
pull_request:
branches: [ master ]
branches: [master, experimental]
paths-ignore:
# Case-sensitive paths to ignore on pull events
- '.editorconfig'
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
run: Installer\get_assets.cmd

- name: Upload installer assets
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
if: github.repository_owner == 'sandboxie-plus'
uses: actions/upload-artifact@v4
with:
name: Assets
Expand All @@ -159,7 +159,7 @@ jobs:
retention-days: 60

- name: Upload Sandboxie x64
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
if: github.repository_owner == 'sandboxie-plus'
uses: actions/upload-artifact@v4
with:
name: Sandboxie_x64
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
run: Installer\copy_build.cmd ARM64

- name: Upload Sandboxie ARM64
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
if: github.repository_owner == 'sandboxie-plus'
uses: actions/upload-artifact@v4
with:
name: Sandboxie_ARM64
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
run: Installer\copy_build.cmd x86

- name: Upload Sandboxie x86
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
if: github.repository_owner == 'sandboxie-plus'
uses: actions/upload-artifact@v4
with:
name: Sandboxie_x86
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add option "AlertBeforeStart".When it is set,a prompt pops up before launching a new program into the sandbox using "Start.exe" and checks if the program that started "Start.exe" is a Sandboxie component itself,if it is not, a warning pops up.



## [1.14.0 / 5.69.0] - 2024-05-17

### Added
Expand Down
1 change: 1 addition & 0 deletions Sandboxie/core/dll/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,7 @@ _FX BOOLEAN Gui_ConnectToWindowStationAndDesktop(HMODULE User32)
// privilege, so access to the window station object
// would have to validate each object directory in the
// path, and this would fail with our process token.
//
//
// to work around this, we issue a special request to
// SbieDrv through NtSetInformationThread which causes
Expand Down
2 changes: 1 addition & 1 deletion SandboxiePlus/SandMan/sandman_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4300,7 +4300,7 @@ This file is part of Sandboxie and all changed done to it will be reverted next
<message>
<location filename="SandMan.cpp" line="2979"/>
<source>&lt;br /&gt;you need to be on the Great Patreon level or higher to unlock this feature.</source>
<translation>&lt;br /&gt;你需要在Patreon赞助上成为Great或更高级别以便解锁这个功能。</translation>
<translation>&lt;br /&gt;你需要在Patreon赞助上成为Great或更高级别的赞助者以便解锁这个功能。</translation>
</message>
<message>
<location filename="SandMan.cpp" line="2991"/>
Expand Down