Merge branch 'main' into feature/update-rust

Author: rjaegers

.devcontainer/cpp/devcontainer.json

@@ -31,6 +31,7 @@
         "[email protected]",
         "[email protected]",
         "[email protected]",
+        "[email protected]",
         "[email protected]",
         "[email protected]",
         "[email protected]",

.devcontainer/rust/devcontainer.json

@@ -18,6 +18,7 @@
         "[email protected]",
         "[email protected]",
         "[email protected]",
+        "[email protected]",
         "[email protected]",
         "[email protected]",
         "[email protected]",

.github/workflows/update-dependencies.yml

@@ -49,6 +49,7 @@ jobs:
     strategy:
       matrix:
         flavor: ["cpp", "rust"]
+        file: ["devcontainer-metadata-vscode.json", "devcontainer.json"]
     permissions:
       contents: write
       pull-requests: write
@@ -62,22 +63,22 @@ jobs:
       - uses: ./.github/actions/update-vscode-extensions
         id: update-extensions
         with:
-          input-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata-vscode.json
+          input-file: .devcontainer/${{ matrix.flavor }}/${{ matrix.file }}
       - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         id: token
         with:
           app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
           private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
       - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          commit-message: "Update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }}"
-          branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-vscode-extensions
+          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 }}
-          title: "chore(deps, ${{ matrix.flavor }}): update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }}"
+          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 }}
           sign-commits: true