Skip to content

Commit

Permalink
Merge branch 'main' into feature/amp-devcontainer-rust/update-apt-pac…
Browse files Browse the repository at this point in the history
…kages
  • Loading branch information
rjaegers authored Feb 4, 2025
2 parents 076a86e + 178ee21 commit d0976da
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/cpp/devcontainer-metadata-vscode.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"[email protected]",
"[email protected]",
"[email protected]",
"ms-vscode.cpptools@1.22.11",
"ms-vscode.cpptools@1.23.5",
"[email protected]",
"[email protected]"
],
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/rust/devcontainer-metadata-vscode.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"extensions": [
"[email protected]",
"[email protected]",
"[email protected].2273",
"[email protected].2284",
"[email protected]",
"usernamehw.errorlens@3.22.0"
"usernamehw.errorlens@3.23.0"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: oxsecurity/megalinter@f90c800040e4f84800700b27b2394d3eecc1fdad # v8.4.0
- uses: oxsecurity/megalinter@ec124f7998718d79379a3c5b39f5359952baf21d # v8.4.2
env:
APPLY_FIXES: all
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
- uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
if: success() || failure()
with:
sarif_file: megalinter-reports/megalinter-report.sarif
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ossf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
results_format: sarif
repo_token: ${{ secrets.SCORECARD_TOKEN }}
publish_results: true
- uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
- uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
create-release:
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
- uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: update-packages
with:
input-file: .devcontainer/${{ matrix.flavor }}/apt-requirements-*.json
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
- uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
id: update-extensions
with:
input-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata-vscode.json
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
- uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vulnerability-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
image: ghcr.io/${{ github.repository }}-${{ matrix.flavor }}:latest
dockerfile: .devcontainer/Dockerfile
- uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
- uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
if: steps.scan.outputs.sarif != ''
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "amp-devcontainer-tests",
"version": "1.0.0",
"devDependencies": {
"@playwright/test": "^1.50.0",
"@types/node": "^22.10.10",
"@playwright/test": "^1.50.1",
"@types/node": "^22.13.0",
"dotenv": "^16.4.7",
"nodemon": "^3.1.9",
"otpauth": "^9.3.6",
Expand Down

0 comments on commit d0976da

Please sign in to comment.