From 18950135ef0bd52bd8e1ef3dedefd8213c4996d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:31:41 +0000 Subject: [PATCH 01/10] Bump github/codeql-action from 2 to 3 (#2906) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0710ed0..ef2c07f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -49,7 +49,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,6 +68,6 @@ jobs: run: .\build.ps1 -Compile -verbose - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" From 7753622897eeedaa5dfad88962d66ed27a3f5fb3 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Tue, 2 Jan 2024 12:04:31 -0500 Subject: [PATCH 02/10] Do CI on development PRs --- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 4 ++-- .github/workflows/tests.yml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 148ad61..65bf52e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: tags: - "v*" pull_request: - branches: [ "master" ] + branches: [ "master", "development" ] #---------------------------------# # environment configuration # diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0710ed0..7329af5 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,7 +8,7 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "master", "development" ] paths-ignore: - '**/*.md' - '**/*.txt' @@ -16,7 +16,7 @@ on: - '**/.gitignore' pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] + branches: [ "master", "development" ] paths-ignore: - '**/*.md' - '**/*.txt' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6fceff3..8d9ecec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - development paths-ignore: - '**/*.md' - '**/*.txt' @@ -12,6 +13,7 @@ on: pull_request: branches: - master + - development paths-ignore: - '**/*.md' - '**/*.txt' From 52762636dc0b787ac374488dabbfac563a1e462c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 00:54:57 +0000 Subject: [PATCH 03/10] Bump actions/upload-artifact from 3 to 4 (#2905) --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65bf52e..af1f4d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,26 +53,26 @@ jobs: run: .\pack.ps1 -verbose - name: Upload artifact (cmder.zip) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: build/cmder.zip name: cmder.zip if-no-files-found: error - name: Upload artifact (cmder.7z) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: build/cmder.7z name: cmder.7z - name: Upload artifact (cmder_mini.zip) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: build/cmder_mini.zip name: cmder_mini.zip - name: Upload artifact (hashes.txt) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: build/hashes.txt name: hashes.txt From 457d99da0b47c4f84fb776d43c00349f54399dcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 19:43:13 +0000 Subject: [PATCH 04/10] Bump peter-evans/create-pull-request from 5 to 6 (#2918) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/vendor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 4b96280..f237626 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -51,7 +51,7 @@ jobs: Set-GHVariable -Name LIST_UPDATED -Value $listUpdated.Trim(', ') echo "UPDATE_MESSAGE<< 0 with: title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies' From 8a199bf47bf738e4a2fe3ccf712172f8eb7cceb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 19:43:29 +0000 Subject: [PATCH 05/10] Bump microsoft/setup-msbuild from 1 to 2 (#2917) Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1 to 2. - [Release notes](https://github.com/microsoft/setup-msbuild/releases) - [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md) - [Commits](https://github.com/microsoft/setup-msbuild/compare/v1...v2) --- updated-dependencies: - dependency-name: microsoft/setup-msbuild dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af1f4d1..befec1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: fetch-depth: 0 - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Build Cmder Launcher shell: pwsh diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7a828af..8e9f4b5 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -60,7 +60,7 @@ jobs: # queries: security-extended,security-and-quality - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Build Cmder Launcher shell: pwsh From 4ad76d8274cbd01e3d33274a9fceae99ddf02677 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:59:16 +0000 Subject: [PATCH 06/10] Bump softprops/action-gh-release from 1 to 2 Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index befec1e..c0c7793 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,7 @@ jobs: name: hashes.txt - name: Create Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | build/cmder.zip From ae518cded80fc6f59507cc20375686da3a5d9ff7 Mon Sep 17 00:00:00 2001 From: loselarry Date: Wed, 10 Apr 2024 16:39:46 +0800 Subject: [PATCH 07/10] fix: fix some typos in comments Signed-off-by: loselarry --- launcher/src/version.rc2.sample | 2 +- scripts/build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/src/version.rc2.sample b/launcher/src/version.rc2.sample index 003621d..b809c36 100644 --- a/launcher/src/version.rc2.sample +++ b/launcher/src/version.rc2.sample @@ -1,7 +1,7 @@ /** * WARNING: do NOT modify this file! the content of this file should be - * automatically genereted before AppVeyor builds using the + * automatically generated before AppVeyor builds using the * respective .ps1 Powershell scripts. * */ diff --git a/scripts/build.ps1 b/scripts/build.ps1 index cab8849..640bba1 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -79,7 +79,7 @@ if ($Compile) { Write-Verbose "Building the launcher..." - # Referene: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference + # Reference: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference msbuild CmderLauncher.vcxproj /t:Clean,Build /p:configuration=Release /m if ($LastExitCode -ne 0) { From c9b77f618a9314d56bb0572d7209c1d02f0e593e Mon Sep 17 00:00:00 2001 From: David Refoua Date: Mon, 20 May 2024 10:57:51 +0330 Subject: [PATCH 08/10] enable `match.expand_envvars` This is part of the "Enhanced default settings" by Clink and a very useful feature --- vendor/clink_settings.default | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vendor/clink_settings.default b/vendor/clink_settings.default index 733028b..00026c7 100644 --- a/vendor/clink_settings.default +++ b/vendor/clink_settings.default @@ -1,6 +1,10 @@ # For explanation of these and other settings see: # https://chrisant996.github.io/clink/clink.html +# name: Expand envvars when completing +# type: boolean +match.expand_envvars = True + # name: Sets how command history expansion is applied # type: enum # options: off,on,not_squoted,not_dquoted,not_quoted From 92419a48fc08fb7f5f564f395c35217595cc492f Mon Sep 17 00:00:00 2001 From: David Refoua Date: Thu, 23 May 2024 21:59:16 +0330 Subject: [PATCH 09/10] log the executable path for improper git --- vendor/lib/lib_git.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index 77997a7..205bd6e 100644 --- a/vendor/lib/lib_git.cmd +++ b/vendor/lib/lib_git.cmd @@ -55,6 +55,7 @@ exit /b set "GIT_VERSION=%%C" ) else ( echo "'git --version' returned an improper version string!" + echo "executable: %git_executable%" pause exit /b ) From 5145a151397bc2d17874c8c8b8aa10a0362d42d2 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Tue, 28 May 2024 17:19:47 +0330 Subject: [PATCH 10/10] display git improper version string as debug --- vendor/lib/lib_git.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index 205bd6e..de963ce 100644 --- a/vendor/lib/lib_git.cmd +++ b/vendor/lib/lib_git.cmd @@ -55,7 +55,7 @@ exit /b set "GIT_VERSION=%%C" ) else ( echo "'git --version' returned an improper version string!" - echo "executable: %git_executable%" + %print_debug% :read_version "returned string: '%%A %%B %%C' by executable path: %git_executable%" pause exit /b )