diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 382362d..8fb9368 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 # @@ -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 @@ -93,32 +93,32 @@ jobs: name: cmder_wt_mini.zip - 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 - name: Create Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | build/cmder.zip diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0710ed0..8e9f4b5 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' @@ -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. @@ -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 @@ -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}}" 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' 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' 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 71b955a..f577fa1 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -82,7 +82,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) { 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 diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index 77997a7..de963ce 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!" + %print_debug% :read_version "returned string: '%%A %%B %%C' by executable path: %git_executable%" pause exit /b )