From 741540b9ff435bb172b3bc9d73ef2ca9c1afe505 Mon Sep 17 00:00:00 2001 From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:52:12 +0000 Subject: [PATCH 1/5] Updated to latest Github Actions Version --- .devcontainer/devcontainer.json | 1 + .github/workflows/release.yaml | 2 +- .github/workflows/test-pr.yaml | 14 +++++++------- .github/workflows/update-documentation.yml | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 74ca75ed..b4735953 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,6 +5,7 @@ }, "postCreateCommand": "npm install -g @devcontainers/cli", "customizations": { + "editor.trimAutoWhitespace": true, "vscode": { "extensions": [ "mads-hartmann.bash-ide-vscode", diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 87d1864a..fa609085 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ jobs: permissions: packages: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: "Publish" uses: devcontainers/action@v1 diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml index 5bd95145..b325cd65 100644 --- a/.github/workflows/test-pr.yaml +++ b/.github/workflows/test-pr.yaml @@ -8,7 +8,7 @@ jobs: outputs: templates: ${{ steps.filter.outputs.changes }} steps: - - uses: dorny/paths-filter@v2 + - uses: dorny/paths-filter@v3 id: filter with: filters: | @@ -58,7 +58,7 @@ jobs: matrix: templates: ${{ fromJSON(needs.detect-changes.outputs.templates) }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: "Install latest devcontainer CLI" run: npm install -g @devcontainers/cli @@ -74,7 +74,7 @@ jobs: # Configure templates only if `devcontainer-template.json` contains the `options` property. optionProp=( $(jq -r '.options' devcontainer-template.json) ) - if [ "${optionProp}" != "" ] && [ "${optionProp}" != "null" ] ; then + if [ "${optionProp}" != "" ] && [ "${optionProp}" != "null" ] ; then options=( $(jq -r '.options | keys[]' devcontainer-template.json) ) if [ "${options[0]}" != "" ] && [ "${options[0]}" != "null" ] ; then @@ -101,7 +101,7 @@ jobs: template_id="${{ matrix.templates }}" src_dir="test/${template_id}" - if [ ! -d "$(pwd)/${src_dir}" ] ; then + if [ ! -d "$(pwd)/${src_dir}" ] ; then echo "Template '${{ matrix.templates }}' is missing a test folder" exit 1 fi @@ -119,11 +119,11 @@ jobs: # Fake out existence of extensions, VS Code Server to validate extensions echo "(*) Stubbing out extensions and VS Code Server..." - # Configuring path for 'devcontainer.json' + # Configuring path for 'devcontainer.json' dev_container_relative_path="src/${template_id}" dev_container_json_name=".devcontainer.json" - if [ -d "$(pwd)/${dev_container_relative_path}/.devcontainer" ] ; then + if [ -d "$(pwd)/${dev_container_relative_path}/.devcontainer" ] ; then dev_container_relative_path="${dev_container_relative_path}/.devcontainer" dev_container_json_name="devcontainer.json" fi @@ -136,7 +136,7 @@ jobs: # Fetching extensions list defined in 'devcontainer.json' extensions="$(jq '.extensions' --compact-output "${dev_container_tmp}" | tr -d '[' | tr -d ']' | tr ',' '\n' 2>/dev/null || echo -n '')" - # Stubbing extensions list for the tests validation with checkExtension() + # Stubbing extensions list for the tests validation with checkExtension() devcontainer exec --workspace-folder "src/${template_id}/" --id-label ${id_label} /bin/sh -c "\ mkdir -p \$HOME/.vscode-server/bin \$HOME/.vscode-server/extensions \ && cd \$HOME/.vscode-server/extensions \ diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml index 21fe1feb..3b6b9c87 100644 --- a/.github/workflows/update-documentation.yml +++ b/.github/workflows/update-documentation.yml @@ -14,7 +14,7 @@ jobs: pull-requests: write if: "github.ref == 'refs/heads/main'" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Generate Documentation uses: devcontainers/action@v1 From 9959e6ff17342e04756579e606250d868cadf5f2 Mon Sep 17 00:00:00 2001 From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> Date: Wed, 18 Dec 2024 03:18:30 +0000 Subject: [PATCH 2/5] Depandabot: Support for Automated Version Update --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f33a02cd..fa6ebfe8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,3 +10,7 @@ updates: directory: "/" schedule: interval: weekly + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: weekly \ No newline at end of file From c4e2d38c920ba097653a4a9c33aee6e4f46e060f Mon Sep 17 00:00:00 2001 From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> Date: Fri, 20 Dec 2024 02:37:52 +0000 Subject: [PATCH 3/5] Incorporated Review Comment --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b4735953..b2dbed3c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,8 +5,8 @@ }, "postCreateCommand": "npm install -g @devcontainers/cli", "customizations": { - "editor.trimAutoWhitespace": true, "vscode": { + "editor.trimAutoWhitespace": true, "extensions": [ "mads-hartmann.bash-ide-vscode", "dbaeumer.vscode-eslint", From dbc621d66af6f670179a9fbb8b9e1485c8a900d4 Mon Sep 17 00:00:00 2001 From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:52:02 +0530 Subject: [PATCH 4/5] Update devcontainer.json --- .devcontainer/devcontainer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b2dbed3c..9440276e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,8 +5,10 @@ }, "postCreateCommand": "npm install -g @devcontainers/cli", "customizations": { + "settings": { + "editor.trimAutoWhitespace": true + }, "vscode": { - "editor.trimAutoWhitespace": true, "extensions": [ "mads-hartmann.bash-ide-vscode", "dbaeumer.vscode-eslint", From 0b822057d3209c4af2a0aeb986b1e4595c240b0a Mon Sep 17 00:00:00 2001 From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:53:30 +0530 Subject: [PATCH 5/5] Update devcontainer.json --- .devcontainer/devcontainer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9440276e..67d9df46 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,15 +5,15 @@ }, "postCreateCommand": "npm install -g @devcontainers/cli", "customizations": { - "settings": { - "editor.trimAutoWhitespace": true - }, "vscode": { "extensions": [ "mads-hartmann.bash-ide-vscode", "dbaeumer.vscode-eslint", "editorconfig.editorconfig" - ] + ], + "settings": { + "editor.trimAutoWhitespace": true + } } } }