From 4f32d23c305168aacee103a6f3d679de00d6e673 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:47:52 +0000 Subject: [PATCH 1/6] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/branches.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/vendor.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml index b7458939..333242bb 100644 --- a/.github/workflows/branches.yml +++ b/.github/workflows/branches.yml @@ -19,7 +19,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # fetch all history for all branches and tags diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f34f201d..148ad619 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: discussions: write steps: - name: Check out repository code (Action from GitHub) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1be97934..0710ed03 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c2d64cfc..6fceff33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: continue-on-error: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Initialize vendors shell: pwsh working-directory: scripts diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index e01155f2..4b96280b 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -24,7 +24,7 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From faf66542b4eb5d70df594156c76655ddf29d2383 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Fri, 22 Sep 2023 13:40:52 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencies?= =?UTF-8?q?=20(git-for-windows=20v2.42.0.windows.2,=20clink=20v1.5.6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 7ae42a95..c015d786 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.41.0.windows.3", - "url": "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/PortableGit-2.41.0.3-64-bit.7z.exe" + "version": "2.42.0.windows.2", + "url": "https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe" }, { "name": "clink", - "version": "1.5.1", - "url": "https://github.com/chrisant996/clink/releases/download/v1.5.1/clink.1.5.1.1e9e51.zip" + "version": "1.5.6", + "url": "https://github.com/chrisant996/clink/releases/download/v1.5.6/clink.1.5.6.fc63d3.zip" }, { "name": "conemu-maximus5", From d0cb6b5c23599cf612fb84f8e5b95340a1560536 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Tue, 10 Oct 2023 13:40:41 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencies?= =?UTF-8?q?=20(clink=20v1.5.9,=20clink-completions=20v0.4.11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index c015d786..3d1ec674 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.5.6", - "url": "https://github.com/chrisant996/clink/releases/download/v1.5.6/clink.1.5.6.fc63d3.zip" + "version": "1.5.9", + "url": "https://github.com/chrisant996/clink/releases/download/v1.5.9/clink.1.5.9.411d0f.zip" }, { "name": "conemu-maximus5", @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.4.10", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.10.zip" + "version": "0.4.11", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.11.zip" } ] From ffb93b18048d614de10008e79d95320f76d45d6f Mon Sep 17 00:00:00 2001 From: David Refoua Date: Wed, 25 Oct 2023 12:32:31 +0330 Subject: [PATCH 4/6] call `init.bat` with the same arguments --- vendor/bin/cmder_shell.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/bin/cmder_shell.cmd b/vendor/bin/cmder_shell.cmd index b2a55ed2..11eeb270 100644 --- a/vendor/bin/cmder_shell.cmd +++ b/vendor/bin/cmder_shell.cmd @@ -9,5 +9,5 @@ if "%cmder_init%" == "1" ( ) pushd "%CMDER_ROOT%" -call "%CMDER_ROOT%\vendor\init.bat" /f +call "%CMDER_ROOT%\vendor\init.bat" /f %* popd From 849844787832e4e0e7f4f8a5d89d7a59715ff8e8 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Fri, 3 Nov 2023 13:40:42 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencies?= =?UTF-8?q?=20(git-for-windows=20v2.43.0-rc0.windows.1,=20clink=20v1.5.12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 3d1ec674..fab5fd5d 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.42.0.windows.2", - "url": "https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe" + "version": "2.43.0-rc0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.43.0-rc0.windows.1/PortableGit-2.43.0-rc0-64-bit.7z.exe" }, { "name": "clink", - "version": "1.5.9", - "url": "https://github.com/chrisant996/clink/releases/download/v1.5.9/clink.1.5.9.411d0f.zip" + "version": "1.5.12", + "url": "https://github.com/chrisant996/clink/releases/download/v1.5.12/clink.1.5.12.c7156f.zip" }, { "name": "conemu-maximus5", From 8d916a444676746ccb903ddb144aae3315b44933 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 9 Nov 2023 04:58:26 -0800 Subject: [PATCH 6/6] remove env refresh race condition --- launcher/src/CmderLauncher.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 9f033c38..3fe20c57 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -469,9 +469,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK); return; } - - LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); - lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8 } bool IsUserOnly(std::wstring opt)