diff --git a/.devcontainer/cpp/devcontainer-metadata.json b/.devcontainer/cpp/devcontainer-metadata.json index c828c0e7..ba79fd43 100644 --- a/.devcontainer/cpp/devcontainer-metadata.json +++ b/.devcontainer/cpp/devcontainer-metadata.json @@ -8,10 +8,10 @@ "llvm-vs-code-extensions.vscode-clangd@0.4.0", "marus25.cortex-debug@1.12.1", "mhutchie.git-graph@1.30.0", - "ms-vscode.cmake-tools@1.21.36", + "ms-vscode.cmake-tools@1.22.26", "ms-vscode.cpptools@1.29.3", "ms-vsliveshare.vsliveshare@1.0.5959", - "sonarsource.sonarlint-vscode@4.40.0" + "sonarsource.sonarlint-vscode@4.41.0" ], "settings": { "C_Cpp.intelliSenseEngine": "disabled", diff --git a/.github/actions/update-vscode-extensions/action.yml b/.github/actions/update-vscode-extensions/action.yml index 6104154e..eb502e85 100644 --- a/.github/actions/update-vscode-extensions/action.yml +++ b/.github/actions/update-vscode-extensions/action.yml @@ -11,9 +11,9 @@ outputs: updated-dependencies: description: JSON array with the names of the updated dependencies value: ${{ steps.update-extensions.outputs.updated-dependencies }} - markdown-summary: - description: Markdown summary of update result - value: ${{ steps.update-extensions.outputs.markdown-summary }} + markdown-summary-file: + description: Path to a file containing the markdown summary of update result + value: ${{ steps.update-extensions.outputs.markdown-summary-file }} runs: using: composite @@ -24,11 +24,8 @@ runs: sudo npm install -g @vscode/vsce shell: bash - run: | - EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) - echo "markdown-summary<<${EOF}" >> "${GITHUB_OUTPUT}" - echo "$(${GITHUB_ACTION_PATH}/update-vscode-extensions.sh ${INPUT_FILE})" >> "${GITHUB_OUTPUT}" - echo "${EOF}" >> "${GITHUB_OUTPUT}" - + ${GITHUB_ACTION_PATH}/update-vscode-extensions.sh ${INPUT_FILE} + echo "markdown-summary-file=${RUNNER_TEMP}/markdown-summary.md" >> "${GITHUB_OUTPUT}" echo "updated-dependencies=$(cat updated-extensions.json)" >> "${GITHUB_OUTPUT}" rm updated-extensions.json id: update-extensions diff --git a/.github/actions/update-vscode-extensions/update-vscode-extensions.sh b/.github/actions/update-vscode-extensions/update-vscode-extensions.sh index f8d08e50..65562316 100755 --- a/.github/actions/update-vscode-extensions/update-vscode-extensions.sh +++ b/.github/actions/update-vscode-extensions/update-vscode-extensions.sh @@ -64,4 +64,5 @@ EXTENSIONS=$(echo "[${EXTENSIONS::-1}]" | jq 'sort_by(. | ascii_downcase)') echo $JSON | jq '.customizations.vscode.extensions = $extensions' --argjson extensions "$EXTENSIONS" > $FILE echo "$UPDATE_DETAILS_MARKDOWN" +echo "$UPDATE_DETAILS_MARKDOWN" > "${RUNNER_TEMP}/markdown-summary.md" echo "$UPDATED_EXTENSIONS_JSON" > updated-extensions.json diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 5c7a159c..89e67e01 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -2,6 +2,7 @@ name: Update Dependencies on: + pull_request: schedule: - cron: "30 2 * * 0" workflow_dispatch: @@ -13,6 +14,7 @@ jobs: name: Update APT Dependencies (🍨 ${{ matrix.flavor }}) runs-on: ubuntu-latest strategy: + fail-fast: false matrix: flavor: ["base", "cpp", "rust"] # Using our own container is required since we need all package sources @@ -31,13 +33,15 @@ jobs: - uses: ./.github/actions/update-apt-packages id: update-packages with: - input-file: .devcontainer/${{ matrix.flavor }}/apt-requirements-*.json + input-file: .devcontainer/${{ matrix.flavor }}/apt-requirements*.json - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: token + if: github.event_name != 'pull_request' with: app-id: ${{ vars.FOREST_RELEASER_APP_ID }} private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }} - uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0 + if: github.event_name != 'pull_request' with: commit-message: "Update ${{ join(fromJson(steps.update-packages.outputs.updated-dependencies), ', ') }}" branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-apt-packages @@ -50,6 +54,7 @@ jobs: name: Update VS Code Extensions (🍨 ${{ matrix.flavor }}, ${{ matrix.file }}) runs-on: ubuntu-latest strategy: + fail-fast: false matrix: flavor: ["cpp", "rust"] file: ["devcontainer-metadata.json", "devcontainer.json"] @@ -67,20 +72,27 @@ jobs: id: update-extensions with: input-file: .devcontainer/${{ matrix.flavor }}/${{ matrix.file }} + - run: | + { + echo "> [!NOTE]" + echo "> Before merging this PR, please conduct a manual test checking basic functionality of the updated plug-ins. There are limited automated tests for the VS Code Extension updates." + echo "" + cat "$MARKDOWN_SUMMARY_FILE" + } >> pull-request-body.md + env: + MARKDOWN_SUMMARY_FILE: ${{ steps.update-extensions.outputs.markdown-summary-file }} - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: token + if: github.event_name != 'pull_request' with: app-id: ${{ vars.FOREST_RELEASER_APP_ID }} private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }} - uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0 + if: github.event_name != 'pull_request' with: commit-message: "Update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }} in ${{ matrix.file }}" branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-vscode-extensions-${{ matrix.file }} - body: | - > [!NOTE] - > Before merging this PR, please conduct a manual test checking basic functionality of the updated plug-ins. There are limited automated tests for the VS Code Extension updates. - - ${{ steps.update-extensions.outputs.markdown-summary }} + body-path: pull-request-body.md title: "chore(deps, ${{ matrix.flavor }}): update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }} in ${{ matrix.file }}" labels: dependencies,vscode-extensions token: ${{ steps.token.outputs.token }} diff --git a/pull-request-body.md b/pull-request-body.md new file mode 100644 index 00000000..cc56c4bc --- /dev/null +++ b/pull-request-body.md @@ -0,0 +1,41 @@ +> [!NOTE] +> Before merging this PR, please conduct a manual test checking basic functionality of the updated plug-ins. There are limited automated tests for the VS Code Extension updates. + +Updates `sonarsource.sonarlint-vscode` from 4.40.0 to 4.41.0 +
+Release notes +
+ +Bugfixes and technical improvements +
+
+ +Updates `ms-vscode.cmake-tools` from 1.21.36 to 1.22.26 +
+Release notes +
+ +Features: +- Add bookmarks and filtering of outline view. [#4539](https://www.github.com/microsoft/vscode-cmake-tools/pull/4539) [@bradphelan](https://www.github.com/bradphelan) +- Add pre-fill project name using current folder name [#4533](https://www.github.com/microsoft/vscode-cmake-tools/pull/4533) [@HO-COOH](https://www.github.com/HO-COOH) +- Add API v5 which adds presets api. [#4510](https://www.github.com/microsoft/vscode-cmake-tools/issues/4510) [@OrkunTokdemir](https://www.github.com/OrkunTokdemir) +- Add an option to extract details about failing tests from CTest output using regular expressions. [#4420](https://www.github.com/microsoft/vscode-cmake-tools/issues/4420) +- Add output parser for [include-what-you-use](https://www.github.com/include-what-you-use). [PR #4548](https://www.github.com/microsoft/vscode-cmake-tools/pull/4548) [@malsyned](https://www.github.com/malsyned) +- Add better return information in the API. [PR #4518](https://www.github.com/microsoft/vscode-cmake-tools/pull/4518) + +Improvements: + +- In the Test Explorer, associate CTest tests with outermost function or macro invocation that calls `add_test()` instead of with the `add_test()` call itself. [#4490](https://www.github.com/microsoft/vscode-cmake-tools/issues/4490) [@malsyned](https://www.github.com/malsyned) +- Better support of cmake v4.1 and its error index files in cmake-file-api replies [#4575](https://www.github.com/microsoft/vscode-cmake-tools/issues/4575) Contributed by STMicroelectronics +- Added support for clang-cl vendor detection: `${buildKitVendor}`, `${buildKitVersionMajor}`, etc. now expand correctly when using clang-cl on Windows [#4524](https://www.github.com/microsoft/vscode-cmake-tools/pull/4524) [@wchou158](https://www.github.com/wchou158) + +Bug Fixes: +- Fix Compiler Warnings not shown in Problems Window [#4567]https://www.github.com/microsoft/vscode-cmake-tools/issues/4567 +- Fix bug in which clicking "Run Test" for filtered tests executed all tests instead [#4501](https://www.github.com/microsoft/vscode-cmake-tools/pull/4501) [@hippo91](https://www.github.com/hippo91) +- Migrate macOS CI from deprecated macOS-13 to macOS-15 Image [#4633](https://www.github.com/microsoft/vscode-cmake-tools/pull/4633) +- Ensure Visual Studio developer environment propagation preserves `VCPKG_ROOT`, enabling vcpkg-dependent configure runs after using the Set Visual Studio Developer Environment command. [microsoft/vscode-cpptools#14083](https://www.github.com/microsoft/vscode-cpptools/issues/14083) +- Fix auto-focusing the "Search" input field in the CMake Cache view. [#4552](https://www.github.com/microsoft/vscode-cmake-tools/pull/4552) [@simhof-basyskom](https://www.github.com/simhof-basyskom) +- Remove the demangling feature in the code coverage implementation for now since it doesn't work properly. [PR #4658](https://www.github.com/microsoft/vscode-cmake-tools/pull/4658) +- Fix incorrect IntelliSense configuration when a `UTILITY` has source files. [#4404](https://www.github.com/microsoft/vscode-cmake-tools/issues/4404) +
+