From 0adbc47c7e032ce25905cbf13d2a2248f16995be Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Mon, 7 Nov 2022 13:54:22 +0000 Subject: [PATCH 01/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(clink=20v1.4.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 3672de5..620b9b7 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.3.51", - "url": "https://github.com/chrisant996/clink/releases/download/v1.3.51/clink.1.3.51.28dd7d.zip" + "version": "1.4.0", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.0/clink.1.4.0.74a8d2.zip" }, { "name": "conemu-maximus5", From 2c656a9c34889355f2dd982ba58fb5df281f8245 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Mon, 7 Nov 2022 17:33:59 +0330 Subject: [PATCH 02/36] added a word --- .github/ISSUE_TEMPLATE/bug-report.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index cfc6f33..e303633 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -25,8 +25,8 @@ body: Cmder version: Operating system: value: | - Cmder version: - Operating system: + Cmder version: + Operating system: render: markdown validations: required: true @@ -55,7 +55,7 @@ body: | šŸŒ [Open Link](https://github.com/cmderdev/cmder/blob/master/README.md) | šŸŒ [Open Link](https://github.com/cmderdev/cmder/wiki) | (What you may be asking here could already be explained there!) - + - Searched for existing issues (including the **closed** ones) for similar problems here: šŸ—ƒ https://github.com/cmderdev/cmder/issues?q=is:issue @@ -91,7 +91,7 @@ body: #### Prerequisites before submitting an issue - We do not support any versions older than the current release series, if you are using an older Cmder please update to the latest version first. - - Verify that the issue is not fixed and is reproducible in the **[latest official Cmder version](https://github.com/cmderdev/cmder/releases).** + - Verify that the issue is not already fixed and is reproducible in the **[latest official Cmder version](https://github.com/cmderdev/cmder/releases).** - Check the **[current issues list](https://github.com/cmderdev/cmder/issues?q=is%3Aissue)** and perform a **search of the issue tracker (including closed ones)** to avoid posting a duplicate bug report. - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/cmderdev/cmder/discussions)**, or the **[questions section](https://github.com/cmderdev/cmder/issues/new?template=question.yml)**. - Verify that the **[wiki](https://github.com/cmderdev/cmder/wiki)** did not contain a suitable solution either. From 1ba542e915183fce506f3dfbd9fab6341b6e8a9d Mon Sep 17 00:00:00 2001 From: David Refoua Date: Mon, 7 Nov 2022 17:38:30 +0330 Subject: [PATCH 03/36] added links to labels --- .github/ISSUE_TEMPLATE/question.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml index efe5613..de27b37 100644 --- a/.github/ISSUE_TEMPLATE/question.yml +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -19,7 +19,7 @@ body: - If you would like to ask for guides on how to integrate Cmder with your favorite IDE of choice, or how to perform a specific task with Cmder, make sure you visit our label section first. - You may already have an answer under the Guides or Questions section. + You may already have an answer under the [šŸ’¬ Guides](https://github.com/cmderdev/cmder/issues?q=label%3A%22%F0%9F%92%AC+Type%3A+Guide%22), [šŸ“– Documentation](https://github.com/cmderdev/cmder/issues?q=label%3A%22%F0%9F%93%96+Documentation%22) or [ā” Questions](https://github.com/cmderdev/cmder/issues?q=is%3Aissue+label%3A%22%E2%9D%94+Type%3A+Question%22) section. For a list of labels, visit **[Labels](https://github.com/cmderdev/cmder/labels)**. From 42df6cd05b2e69352773990a789cf776f60136e5 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sat, 19 Nov 2022 02:32:02 +0000 Subject: [PATCH 04/36] fix git bash GIT_INSTALL_ROOT --- vendor/cmder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor/cmder.sh b/vendor/cmder.sh index 4074346..8467593 100644 --- a/vendor/cmder.sh +++ b/vendor/cmder.sh @@ -33,11 +33,11 @@ CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::') export CMDER_ROOT -if [ -d "/c/Program Files/Git" ] ; then +if [ -f "/c/Program Files/Git/cmd/git.exe" ] ; then GIT_INSTALL_ROOT="/c/Program Files/Git" -elif [ -d "/c/Program Files(x86)/Git" ] ; then +elif [ -f "/c/Program Files(x86)/Git/cmd/git.exe" ] ; then GIT_INSTALL_ROOT="/c/Program Files(x86)/Git" -elif [ -d "${CMDER_ROOT}/vendor/git-for-windows" ] ; then +elif [ -f "${CMDER_ROOT}/vendor/git-for-windows/cmd/git.exe" ] ; then GIT_INSTALL_ROOT=${CMDER_ROOT}/vendor/git-for-windows fi From 0fdcda98cf80e45350833da351a6a55ca64644e8 Mon Sep 17 00:00:00 2001 From: Chris Antos Date: Mon, 5 Dec 2022 13:52:14 -0800 Subject: [PATCH 05/36] Fix https://github.com/cmderdev/cmder/issues/2789 Holding ^C made git.exe hang while cmd.exe (Clink) updated the prompt. The prompt script had three problems: 1. It invoked `git config` every time a prompt was displayed, to figure out where to skip invoking `git status`. But it even did that if the current directory wasn't part of a git repo. 2. It invoked `git config` two times for every single prompt, to attempt to improve performance if the user disables `git status` coloring. But two times for every single prompt is expensive, so it has the opposite effect in the general case, and noticeably degrades performance. 3. It invoked `git config` using a blocking call, instead of using the async prompt support in Clink. That significantly reduced the benefit of having used async prompt filtering for `git status`. Now the `git config` invocations use async prompt filtering, which lets the prompt display instantaneously. It also now uses a timer to avoid invoking `git config` repeatedly when new prompts show up in rapid succession. Also, the `cmderGitStatusOptIn` variable is no longer leaked into the Lua global namespace. These changes resolve the issue: holding ^C is very fast and no longer causes git.exe to hang. --- vendor/clink.lua | 122 +++++++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 56 deletions(-) diff --git a/vendor/clink.lua b/vendor/clink.lua index d0e3e6c..6a9058e 100644 --- a/vendor/clink.lua +++ b/vendor/clink.lua @@ -408,13 +408,63 @@ local function get_svn_status() return true end +--- +-- Get the status of working dir +-- @return {bool} +--- +local last_git_status_time = nil +local last_git_status_setting = true +local function get_git_status_setting() + local time = os.clock() + local last_time = last_git_status_time + last_git_status_time = time + if last_time and time >= 0 and time - last_time < 10 then + return last_git_status_setting + end + + -- When async prompt filtering is available, check the + -- prompt_overrideGitStatusOptIn config setting for whether to ignore the + -- cmder.status and cmder.cmdstatus git config opt-in settings. + if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") then + if prompt_overrideGitStatusOptIn then + last_git_status_setting = true + return true + end + end + + local gitStatusConfig = io_popenyield("git --no-pager config cmder.status 2>nul") + for line in gitStatusConfig:lines() do + if string.match(line, 'false') then + gitStatusConfig:close() + last_git_status_setting = false + return false + end + end + gitStatusConfig:close() + + local gitCmdStatusConfig = io_popenyield("git --no-pager config cmder.cmdstatus 2>nul") + for line in gitCmdStatusConfig:lines() do + if string.match(line, 'false') then + gitCmdStatusConfig:close() + last_git_status_setting = false + return false + end + end + gitCmdStatusConfig:close() + + last_git_status_setting = true + return true +end + --- -- Use a prompt coroutine to get git status in the background. -- Cache the info so we can reuse it next time to reduce flicker. --- local function get_git_info_table() local info = clink_promptcoroutine(function () - return get_git_status() + -- Use git status if allowed. + local cmderGitStatusOptIn = get_git_status_setting() + return cmderGitStatusOptIn and get_git_status() or {} end) if not info then info = cached_info.git_info or {} @@ -424,42 +474,6 @@ local function get_git_info_table() return info end ---- --- Get the status of working dir --- @return {bool} ---- -local function get_git_status_setting() - -- When async prompt filtering is available, check the - -- prompt_overrideGitStatusOptIn config setting for whether to ignore the - -- cmder.status and cmder.cmdstatus git config opt-in settings. - if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") then - if prompt_overrideGitStatusOptIn then - return true - end - end - - local gitStatusConfig = io.popen("git --no-pager config cmder.status 2>nul") - - for line in gitStatusConfig:lines() do - if string.match(line, 'false') then - gitStatusConfig:close() - return false - end - end - - local gitCmdStatusConfig = io.popen("git --no-pager config cmder.cmdstatus 2>nul") - for line in gitCmdStatusConfig:lines() do - if string.match(line, 'false') then - gitCmdStatusConfig:close() - return false - end - end - gitStatusConfig:close() - gitCmdStatusConfig:close() - - return true -end - local function git_prompt_filter() -- Don't do any git processing if the prompt doesn't want to show git info. @@ -477,7 +491,6 @@ local function git_prompt_filter() local git_dir = get_git_dir() local color - cmderGitStatusOptIn = get_git_status_setting() if git_dir then local branch = get_git_branch(git_dir) if branch then @@ -487,28 +500,25 @@ local function git_prompt_filter() cached_info.git_dir = git_dir cached_info.git_branch = branch end - -- Use git status if allowed. - if cmderGitStatusOptIn then - -- if we're inside of git repo then try to detect current branch - -- Has branch => therefore it is a git folder, now figure out status - local gitInfo = get_git_info_table() - local gitStatus = gitInfo.status - local gitConflict = gitInfo.conflict - if gitStatus == nil then - color = colors.nostatus - elseif gitStatus then - color = colors.clean - else - color = colors.dirty - end + -- If we're inside of git repo then try to detect current branch + -- Has branch => therefore it is a git folder, now figure out status + local gitInfo = get_git_info_table() + local gitStatus = gitInfo.status + local gitConflict = gitInfo.conflict - if gitConflict then - color = colors.conflict - end - else + if gitStatus == nil then color = colors.nostatus + elseif gitStatus then + color = colors.clean + else + color = colors.dirty end + + if gitConflict then + color = colors.conflict + end + clink.prompt.value = string.gsub(clink.prompt.value, "{git}", " "..color.."("..verbatim(branch)..")") return false end From 271fe4c822743722596fdf6752a2c52f34ecb1a3 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Tue, 13 Dec 2022 13:41:54 +0000 Subject: [PATCH 06/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(git-for-windows=20v2.39.0.windows.1,=20clink=20v1.4.3,=20c?= =?UTF-8?q?link-completions=20v0.4.2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 620b9b7..cf3d401 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.38.1.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.38.1.windows.1/PortableGit-2.38.1-64-bit.7z.exe" + "version": "2.39.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.39.0.windows.1/PortableGit-2.39.0-64-bit.7z.exe" }, { "name": "clink", - "version": "1.4.0", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.0/clink.1.4.0.74a8d2.zip" + "version": "1.4.3", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.3/clink.1.4.3.67deea.zip" }, { "name": "conemu-maximus5", @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.4.1", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.4.1.zip" + "version": "0.4.2", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.2.zip" } ] From 9d2ac373c5f20a34a01b2ec36e79368a874f7ba3 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Wed, 14 Dec 2022 13:41:25 +0000 Subject: [PATCH 07/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(clink=20v1.4.4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index cf3d401..7716026 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.4.3", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.3/clink.1.4.3.67deea.zip" + "version": "1.4.4", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.4/clink.1.4.4.7fe1ca.zip" }, { "name": "conemu-maximus5", From 5eaf0d039627131f9b18154ab0e6fb21a33b44f3 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Thu, 15 Dec 2022 21:05:13 +0000 Subject: [PATCH 08/36] use github token when available --- .github/workflows/vendor.yml | 2 ++ scripts/update.ps1 | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 0d3630c..1e8aecd 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -30,6 +30,8 @@ jobs: - id: make-changes name: Checking for updates + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json) . .\scripts\update.ps1 -verbose diff --git a/scripts/update.ps1 b/scripts/update.ps1 index 9eea219..1e6ccc1 100644 --- a/scripts/update.ps1 +++ b/scripts/update.ps1 @@ -102,6 +102,12 @@ function Fetch-DownloadUrl { $p = $url.Segments.Split([Environment]::NewLine) + $headers = @{} + + if ($($env:GITHUB_TOKEN)) { + $headers["Authorization"] = "token $($env:GITHUB_TOKEN)" + } + # Api server for GitHub $urlHost = "api.github.com" @@ -110,7 +116,7 @@ function Fetch-DownloadUrl { $apiUrl = [uri] (New-Object System.UriBuilder -ArgumentList $url.Scheme, $urlHost, -1, $urlPath).Uri - $info = Invoke-RestMethod -Uri $apiUrl + $info = Invoke-RestMethod -Uri $apiUrl -Headers $headers $downloadLinks = (New-Object System.Collections.Generic.List[System.Object]) From efa2e576d0761ee66f9c9a79694e173383cfe013 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 19 Dec 2022 08:33:35 +0000 Subject: [PATCH 09/36] Update conemu to mitigate CVE-2022-46387 (#2794) Signed-off-by: Martin Kemp Signed-off-by: Martin Kemp --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 7716026..52b4ab1 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "22.08.07", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v22.08.07/ConEmuPack.220807.7z" + "version": "22.12.18", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v22.12.18/ConEmuPack.221218.7z" }, { "name": "clink-completions", From 691addb95ccf82ca029799a75ecbd928fdbe1cb5 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 19 Dec 2022 09:16:06 +0000 Subject: [PATCH 10/36] Use CodeQL Scanning (#2795) * Use CodeQL Scanning * run on windows Signed-off-by: Martin Kemp * Use our build scripts Signed-off-by: Martin Kemp Signed-off-by: Martin Kemp --- .github/workflows/codeql.yml | 68 ++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..bca11e9 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,68 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master" ] + schedule: + - cron: '30 19 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: windows-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'cpp' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v1 + + - name: Build Cmder Launcher + shell: pwsh + working-directory: scripts + run: .\build.ps1 -Compile -verbose + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}" From 328f4b30736c21c33036aabf9c9cc02599a14c13 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 19 Dec 2022 10:13:34 +0000 Subject: [PATCH 11/36] Use New-TimeSpan to calculate total elapsed time Fixes #2797 Signed-off-by: Martin Kemp --- vendor/profile.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 9e26249..3609d30 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -5,7 +5,7 @@ # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED # !!! Use "%CMDER_ROOT%\config\user_profile.ps1" to add your own startup commands -$CMDER_INIT_START = $(Get-Date -UFormat %s) +$CMDER_INIT_START = Get-Date # Compatibility with PS major versions <= 2 if (!$PSScriptRoot) { @@ -224,5 +224,8 @@ if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionS Set-Item -Path function:\prompt -Value $Prompt -Options ReadOnly } -$CMDER_INIT_END = $(Get-Date -UFormat %s) -Write-Verbose "Elapsed Time: $(get-Date) `($($CMDER_INIT_END - $CMDER_INIT_START) total`)" +$CMDER_INIT_END = Get-Date + +$ElapsedTime = New-TimeSpan -Start $CMDER_INIT_START -End $CMDER_INIT_END + +Write-Verbose "Elapsed Time: $($ElapsedTime.TotalSecond) seconds total" From 470808838f113c26b514268de911dc0b7bd0c35e Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 19 Dec 2022 10:15:02 +0000 Subject: [PATCH 12/36] TotalSecond -> TotalSeconds Signed-off-by: Martin Kemp --- vendor/profile.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 3609d30..c8f9871 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -228,4 +228,4 @@ $CMDER_INIT_END = Get-Date $ElapsedTime = New-TimeSpan -Start $CMDER_INIT_START -End $CMDER_INIT_END -Write-Verbose "Elapsed Time: $($ElapsedTime.TotalSecond) seconds total" +Write-Verbose "Elapsed Time: $($ElapsedTime.TotalSeconds) seconds total" From 4766425ad3db46a5cab4b7806f4bff7edd6df7a1 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 19 Dec 2022 10:20:34 +0000 Subject: [PATCH 13/36] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..90e05c4 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" From 2e9b512102f02254017614ca640141c8cdcd67e1 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Tue, 20 Dec 2022 10:45:09 +0330 Subject: [PATCH 14/36] adjust history settings to more suitable default values --- vendor/clink_settings.default | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor/clink_settings.default b/vendor/clink_settings.default index 39e397e..733028b 100644 --- a/vendor/clink_settings.default +++ b/vendor/clink_settings.default @@ -8,15 +8,15 @@ history.expand_mode = not_dquoted # name: Skip adding lines prefixed with whitespace # type: boolean -history.ignore_space = False +history.ignore_space = True # name: The number of history lines to save # type: integer -history.max_lines = 10000 +history.max_lines = 25000 # name: Share history between instances # type: boolean -history.shared = True +history.shared = False # name: Auto-answer terminate prompt # type: enum From e1bf703f50a120e47af340de8b973891f7e276aa Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Tue, 20 Dec 2022 10:50:44 -0600 Subject: [PATCH 15/36] Fix error from profile.d PowerShell scripts When there are `ps1` files in `profile.d`, the following error is logged: >A positional parameter cannot be found that accepts argument 'Sourcing'. --- vendor/profile.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index c8f9871..d1087b1 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -123,11 +123,11 @@ if (-not (Test-Path -PathType container "$ENV:CMDER_ROOT\config\profile.d")) { Push-Location $ENV:CMDER_ROOT\config\profile.d foreach ($x in Get-ChildItem *.psm1) { - Write-Verbose Write-Host Sourcing $x + Write-Verbose "Sourcing $x" Import-Module $x } foreach ($x in Get-ChildItem *.ps1) { - Write-Verbose Write-Host Sourcing $x + Write-Verbose "Sourcing $x" . $x } Pop-Location @@ -137,11 +137,11 @@ Pop-Location if ($ENV:CMDER_USER_CONFIG -ne "" -and (Test-Path "$ENV:CMDER_USER_CONFIG\profile.d")) { Push-Location $ENV:CMDER_USER_CONFIG\profile.d foreach ($x in Get-ChildItem *.psm1) { - Write-Verbose Write-Host Sourcing $x + Write-Verbose "Sourcing $x" Import-Module $x } foreach ($x in Get-ChildItem *.ps1) { - Write-Verbose Write-Host Sourcing $x + Write-Verbose "Sourcing $x" . $x } Pop-Location From 9e55c4820006b15d91744e5b6f52c69782db084c Mon Sep 17 00:00:00 2001 From: David Refoua Date: Wed, 21 Dec 2022 02:29:31 +0330 Subject: [PATCH 16/36] fix checking for clink injection --- vendor/init.bat | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index a6ae141..62a6112 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -166,11 +166,19 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" ( ) if "%CMDER_CLINK%" == "1" ( + REM TODO: If clink is already injected, goto :CLINK_FINISH + goto :INJECT_CLINK +) + +goto :SKIP_CLINK + +:INJECT_CLINK %print_verbose% "Injecting Clink!" :: Check if Clink is not present if not exist "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" ( %print_error% "Clink executable is not present in 'vendor\clink\clink_%clink_architecture%.exe'" + goto :SKIP_CLINK ) :: Run Clink @@ -200,7 +208,10 @@ if "%CMDER_CLINK%" == "1" ( if errorlevel 1 ( %print_error% "Clink initilization has failed with error code: %errorlevel%" ) -) else ( + + goto :CLINK_FINISH + +:SKIP_CLINK %print_warning% "Skipping Clink Injection!" for /f "tokens=2 delims=:." %%x in ('chcp') do set cp=%%x @@ -210,7 +221,8 @@ if "%CMDER_CLINK%" == "1" ( prompt $E[1;32;49m$P$S$_$E[1;30;49mĪ»$S$E[0m chcp %cp%>nul -) + +:CLINK_FINISH if "%CMDER_CONFIGURED%" GTR "1" ( %print_verbose% "Cmder is already configured, skipping Cmder Init!" From 8b3f38ad218fdd5750bbb59199214cd2b76f5027 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Wed, 21 Dec 2022 02:35:11 +0330 Subject: [PATCH 17/36] fix misspellings --- vendor/init.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index 62a6112..c212edb 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -148,7 +148,7 @@ if defined CMDER_USER_CONFIG ( ) if not "%CMDER_SHELL%" == "cmd" ( - %print_warning% "Incompatible 'ComSpec/Shell' Detetected: %CMDER_SHELL%" + %print_warning% "Incompatible 'ComSpec/Shell' Detected: %CMDER_SHELL%" set CMDER_CLINK=0 set CMDER_ALIASES=0 ) @@ -161,7 +161,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" ( set clink_architecture=x64 set architecture_bits=64 ) else ( - %print_warning% "Incompatible Processor Detetected: %PROCESSOR_ARCHITECTURE%" + %print_warning% "Incompatible Processor Detected: %PROCESSOR_ARCHITECTURE%" set CMDER_CLINK=0 ) @@ -193,7 +193,7 @@ goto :SKIP_CLINK copy "%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default" "%CMDER_CONFIG_DIR%\cmder_prompt_config.lua" ) - :: Cleanup lagacy Clink Settings file + :: Cleanup legacy Clink Settings file if exist "%CMDER_CONFIG_DIR%\settings" if exist "%CMDER_CONFIG_DIR%\clink_settings" ( del "%CMDER_CONFIG_DIR%\settings" ) @@ -206,7 +206,7 @@ goto :SKIP_CLINK "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor" if errorlevel 1 ( - %print_error% "Clink initilization has failed with error code: %errorlevel%" + %print_error% "Clink initialization has failed with error code: %errorlevel%" ) goto :CLINK_FINISH From a03ad615f1c913d6a8e537065fabc4cd63f420e1 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Wed, 21 Dec 2022 13:40:56 +0000 Subject: [PATCH 18/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(clink=20v1.4.5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 52b4ab1..853b1fd 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.4.4", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.4/clink.1.4.4.7fe1ca.zip" + "version": "1.4.5", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.5/clink.1.4.5.2e84bc.zip" }, { "name": "conemu-maximus5", From dc2bc9bda7705c3fe2ffb773e1dc76eff64168e8 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Wed, 21 Dec 2022 18:08:49 +0000 Subject: [PATCH 19/36] Draft a release on a tag being pushed (#2804) Signed-off-by: Martin Kemp Signed-off-by: Martin Kemp --- .github/workflows/build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00a948c..e79c8eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ name: Build Cmder on: push: branches: [ "master" ] + tags: + - "v*" pull_request: branches: [ "master" ] @@ -72,3 +74,15 @@ jobs: with: path: build/hashes.txt name: hashes.txt + + - name: Create Release + uses: softprops/action-gh-release@v1 + with: + files: | + build/cmder.zip + build/cmder.7z + build/cmder_mini.zip + build/hashes.txt + draft: true + generate_release_notes: true + if: startsWith(github.ref, 'refs/tags/') From 92a3c9c21568a0a4d5955e1694bdcaa1ea09522d Mon Sep 17 00:00:00 2001 From: David GABISON Date: Thu, 22 Dec 2022 12:16:51 +0100 Subject: [PATCH 20/36] fix: /task "" no longer works since version 1.3.20 --- launcher/src/CmderLauncher.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index fc34eeb..9f033c3 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -425,11 +425,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr swprintf_s(args, L"%s /single", args); } - if (!streqi(cmderTask.c_str(), L"")) - { - swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str()); - } - if (!streqi(cmderTitle.c_str(), L"")) { swprintf_s(args, L"%s /title \"%s\"", args, cmderTitle.c_str()); @@ -445,6 +440,14 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr swprintf_s(args, L"%s %s", args, cmderConEmuArgs.c_str()); } + // The `/run` arg and its value MUST be the last arg of ConEmu + // see : https://conemu.github.io/en/ConEmuArgs.html + // > This must be the last used switch (excepting -new_console and -cur_console) + if (!streqi(cmderTask.c_str(), L"")) + { + swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str()); + } + SetEnvironmentVariable(L"CMDER_ROOT", exeDir); if (wcscmp(userConfigDirPath, configDirPath) != 0) { From 5135370ec12fffd32e3323103b63588ad5d6cb6b Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Thu, 22 Dec 2022 13:40:52 +0000 Subject: [PATCH 21/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(git-for-windows=20v2.39.0.windows.2,=20clink=20v1.4.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 853b1fd..941ef5b 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.39.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.39.0.windows.1/PortableGit-2.39.0-64-bit.7z.exe" + "version": "2.39.0.windows.2", + "url": "https://github.com/git-for-windows/git/releases/download/v2.39.0.windows.2/PortableGit-2.39.0.2-64-bit.7z.exe" }, { "name": "clink", - "version": "1.4.5", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.5/clink.1.4.5.2e84bc.zip" + "version": "1.4.6", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.6/clink.1.4.6.8b1dec.zip" }, { "name": "conemu-maximus5", From f99480fd497a5197002231558b8fe6bb51d1ff9d Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 25 Dec 2022 17:13:44 +0000 Subject: [PATCH 22/36] update vendor scripts --- scripts/update.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/update.ps1 b/scripts/update.ps1 index 1e6ccc1..b69edd9 100644 --- a/scripts/update.ps1 +++ b/scripts/update.ps1 @@ -104,10 +104,12 @@ function Fetch-DownloadUrl { $headers = @{} - if ($($env:GITHUB_TOKEN)) { + if ($env:GITHUB_TOKEN) { $headers["Authorization"] = "token $($env:GITHUB_TOKEN)" } + Write-Host $headers + # Api server for GitHub $urlHost = "api.github.com" From c9e872e826e15302b56b2bac44616d5716164c3a Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 25 Dec 2022 17:30:01 +0000 Subject: [PATCH 23/36] don't display the headers variable --- scripts/update.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/update.ps1 b/scripts/update.ps1 index b69edd9..768744a 100644 --- a/scripts/update.ps1 +++ b/scripts/update.ps1 @@ -108,8 +108,6 @@ function Fetch-DownloadUrl { $headers["Authorization"] = "token $($env:GITHUB_TOKEN)" } - Write-Host $headers - # Api server for GitHub $urlHost = "api.github.com" From b5ae5eb7115b462655d133ae4f15fdba6cdd107c Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 25 Dec 2022 17:33:10 +0000 Subject: [PATCH 24/36] display all env vars --- .github/workflows/vendor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 1e8aecd..48aa9ee 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -33,6 +33,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + Write-Host ${{ secrets.GITHUB_TOKEN }} + dir env $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json) . .\scripts\update.ps1 -verbose Set-GHVariable -Name COUNT_UPDATED -Value $count From fd12ece9affccfc31b162cbf3c148343117e6c00 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 25 Dec 2022 17:49:14 +0000 Subject: [PATCH 25/36] test github token --- .github/workflows/vendor.yml | 3 +-- scripts/update.ps1 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 48aa9ee..21d2658 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -33,8 +33,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - Write-Host ${{ secrets.GITHUB_TOKEN }} - dir env + $env:GITHUB_TOKEN = "${{ secrets.GITHUB_TOKEN }}" $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json) . .\scripts\update.ps1 -verbose Set-GHVariable -Name COUNT_UPDATED -Value $count diff --git a/scripts/update.ps1 b/scripts/update.ps1 index 768744a..b69edd9 100644 --- a/scripts/update.ps1 +++ b/scripts/update.ps1 @@ -108,6 +108,8 @@ function Fetch-DownloadUrl { $headers["Authorization"] = "token $($env:GITHUB_TOKEN)" } + Write-Host $headers + # Api server for GitHub $urlHost = "api.github.com" From af6472cb575b8805ca7f9735a44c46141e3ecd8a Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 25 Dec 2022 17:55:56 +0000 Subject: [PATCH 26/36] remove duplicate variable settings --- .github/workflows/vendor.yml | 1 - scripts/update.ps1 | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 21d2658..1e8aecd 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -33,7 +33,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - $env:GITHUB_TOKEN = "${{ secrets.GITHUB_TOKEN }}" $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json) . .\scripts\update.ps1 -verbose Set-GHVariable -Name COUNT_UPDATED -Value $count diff --git a/scripts/update.ps1 b/scripts/update.ps1 index b69edd9..768744a 100644 --- a/scripts/update.ps1 +++ b/scripts/update.ps1 @@ -108,8 +108,6 @@ function Fetch-DownloadUrl { $headers["Authorization"] = "token $($env:GITHUB_TOKEN)" } - Write-Host $headers - # Api server for GitHub $urlHost = "api.github.com" From 0b01ea6f63797803149a72d214dd7634d704fb37 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Sun, 15 Jan 2023 13:41:12 +0000 Subject: [PATCH 27/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(clink=20v1.4.9,=20clink-completions=20v0.4.4)?= 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 941ef5b..67dfbaa 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.4.6", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.6/clink.1.4.6.8b1dec.zip" + "version": "1.4.9", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.9/clink.1.4.9.fc640f.zip" }, { "name": "conemu-maximus5", @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.4.2", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.2.zip" + "version": "0.4.4", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.4.zip" } ] From 9e87f375f11b89dd61a54ea4a3b9a957e8ae845a Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Mon, 16 Jan 2023 13:41:30 +0000 Subject: [PATCH 28/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(clink=20v1.4.10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 67dfbaa..f4c3c33 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.4.9", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.9/clink.1.4.9.fc640f.zip" + "version": "1.4.10", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.10/clink.1.4.10.45c041.zip" }, { "name": "conemu-maximus5", From 6bd2e260f0892fcc895c5f67ba949e8597260823 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 22 Jan 2023 12:30:30 -0800 Subject: [PATCH 29/36] Add time to debug output --- vendor/lib/lib_console.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/lib/lib_console.cmd b/vendor/lib/lib_console.cmd index f255c03..c3649cc 100644 --- a/vendor/lib/lib_console.cmd +++ b/vendor/lib/lib_console.cmd @@ -40,7 +40,7 @@ exit /b :::. :::------------------------------------------------------------------------------- - if %debug_output% gtr 0 echo DEBUG(%~1): %~2 & echo. + if %debug_output% gtr 0 echo %time% DEBUG(%~1): %~2 & echo. exit /b :verbose_output From d82fece61e2fb2ce7a82915a458b1840785ab7e1 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 23 Jan 2023 19:16:44 -0800 Subject: [PATCH 30/36] Remove unnecessary git actions in fiast init --- vendor/init.bat | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/vendor/init.bat b/vendor/init.bat index c212edb..027f710 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -249,6 +249,13 @@ if defined GIT_INSTALL_ROOT ( %print_debug% init.bat "Skipping Git Auto-Detect!" goto :VENDORED_GIT ) + + %print_debug% init.bat "Fast init is enabled, vendored Git does not exist" + for /F "delims=" %%F in ('where git.exe 2^>nul') do ( + set "EXT_GIT_EXE=%%~fF" + %print_debug% init.bat "Found User installed Git at '%%~fF'. Skipping Git Auto-Detect!" + goto :SET_ENV + ) ) %print_debug% init.bat "Looking for Git install root..." @@ -321,6 +328,8 @@ if %nix_tools% geq 1 ( ) ) +:SET_ENV + :: Plink (PuTTY Link) is a command-line connection tool similar to ssh, setting its protocol to ssh set PLINK_PROTOCOL=ssh @@ -328,6 +337,12 @@ set PLINK_PROTOCOL=ssh if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe" :: Find locale.exe: From the git install root, from the path, using the git installed env, or fallback using the env from the path. +setlocal enabledelayedexpansion +if not defined git_locale if defined EXT_GIT_EXE ( + set "GIT_INSTALL_ROOT=!EXT_GIT_EXE:\cmd\git.exe=!" +) +endlocal && set GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT% + if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\locale.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\locale.exe" if not defined git_locale for /F "tokens=* delims=" %%F in ('where locale.exe 2^>nul') do ( if not defined git_locale set git_locale="%%F" ) if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\env.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\env.exe" /usr/bin/locale From 4efbe0bd62a20291dae8fa9c42afaa940b7f3e97 Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Fri, 10 Mar 2023 13:42:19 +0000 Subject: [PATCH 31/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(git-for-windows=20v2.40.0-rc2.windows.1,=20clink=20v1.4.22?= =?UTF-8?q?,=20clink-completions=20v0.4.7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/sources.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index f4c3c33..f96c2c1 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.39.0.windows.2", - "url": "https://github.com/git-for-windows/git/releases/download/v2.39.0.windows.2/PortableGit-2.39.0.2-64-bit.7z.exe" + "version": "2.40.0-rc2.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.40.0-rc2.windows.1/PortableGit-2.40.0-rc2-64-bit.7z.exe" }, { "name": "clink", - "version": "1.4.10", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.10/clink.1.4.10.45c041.zip" + "version": "1.4.22", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.22/clink.1.4.22.33f515.zip" }, { "name": "conemu-maximus5", @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.4.4", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.4.zip" + "version": "0.4.7", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.7.zip" } ] From 36ad85c7b73824f1e39ac98f797140068ce040ac Mon Sep 17 00:00:00 2001 From: DRSDavidSoft Date: Thu, 16 Mar 2023 13:43:09 +0000 Subject: [PATCH 32/36] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencie?= =?UTF-8?q?s=20(git-for-windows=20v2.40.0.windows.1,=20clink=20v1.4.23)?= 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 f96c2c1..9ae99c1 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,13 +1,13 @@ [ { "name": "git-for-windows", - "version": "2.40.0-rc2.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.40.0-rc2.windows.1/PortableGit-2.40.0-rc2-64-bit.7z.exe" + "version": "2.40.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.40.0.windows.1/PortableGit-2.40.0-64-bit.7z.exe" }, { "name": "clink", - "version": "1.4.22", - "url": "https://github.com/chrisant996/clink/releases/download/v1.4.22/clink.1.4.22.33f515.zip" + "version": "1.4.23", + "url": "https://github.com/chrisant996/clink/releases/download/v1.4.23/clink.1.4.23.5fc3fc.zip" }, { "name": "conemu-maximus5", From 1d1e815c9183540420eb3b63eaca6bf6665e86c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 16:02:00 +0000 Subject: [PATCH 33/36] Bump peter-evans/create-pull-request from 4 to 5 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .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 1e8aecd..e01155f 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 d80202c791e2de85c07aa4a0de249d70c1b857e0 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 23 Apr 2023 23:39:35 +0330 Subject: [PATCH 34/36] add task to auto push to development --- .github/workflows/branches.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/branches.yml diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml new file mode 100644 index 0000000..e850479 --- /dev/null +++ b/.github/workflows/branches.yml @@ -0,0 +1,31 @@ +name: Update branches + +# Controls when the action will run. +on: + # Triggers the workflow on push events for the development branch + push: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This job updates the development branch with the master branch + update-development: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # 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 + + # Runs a single command using the runners shell + - name: Merge master into development + run: | + git config user.name "${{ github.actor }}" + git config user.email "${{ github.actor }}@users.noreply.github.com" + git checkout development + git merge --no-ff master + git push origin development From d838f861af01805e79574c47e96e23ab5707b43b Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 23 Apr 2023 23:43:26 +0330 Subject: [PATCH 35/36] checkout development --- .github/workflows/branches.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml index e850479..4341c79 100644 --- a/.github/workflows/branches.yml +++ b/.github/workflows/branches.yml @@ -20,6 +20,8 @@ jobs: steps: # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it - uses: actions/checkout@v3 + with: + ref: development # Runs a single command using the runners shell - name: Merge master into development From 23488fcbb2b845b7c73f74c967096ccd7ec7bcf8 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Sun, 23 Apr 2023 23:47:28 +0330 Subject: [PATCH 36/36] fetch all history for all branches and tags --- .github/workflows/branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml index 4341c79..b745893 100644 --- a/.github/workflows/branches.yml +++ b/.github/workflows/branches.yml @@ -21,7 +21,7 @@ jobs: # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it - uses: actions/checkout@v3 with: - ref: development + fetch-depth: 0 # fetch all history for all branches and tags # Runs a single command using the runners shell - name: Merge master into development