Skip to content

Commit

Permalink
Merge branch 'main' into feature/udev
Browse files Browse the repository at this point in the history
  • Loading branch information
rjaegers committed Sep 17, 2024
2 parents 0f75ac6 + ac2c8d6 commit ac3a373
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/cpp/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"features": {
"ghcr.io/devcontainers/features/desktop-lite:1": {
"version": "1.2.4",
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:3f1e02742f4eab98a798c4beb126eb467a6bd224857b6127050f0dc6e92eb310",
"integrity": "sha256:3f1e02742f4eab98a798c4beb126eb467a6bd224857b6127050f0dc6e92eb310"
"version": "1.2.5",
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:dc19b193d799be3c7c3533007624f196082b1d59024b537b7a7811d7bcbddb03",
"integrity": "sha256:dc19b193d799be3c7c3533007624f196082b1d59024b537b7a7811d7bcbddb03"
},
"ghcr.io/devcontainers/features/github-cli:1": {
"version": "1.0.13",
Expand All @@ -16,4 +16,4 @@
"integrity": "sha256:902b97a02d04ffd3404579d793f3e101d1126d4d198929196c5872ed75a6d351"
}
}
}
}
2 changes: 1 addition & 1 deletion .devcontainer/rust/devcontainer-metadata-vscode.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"extensions": [
"mhutchie.git-graph@1.30.0",
"ms-vsliveshare.vsliveshare@1.0.5936",
"rust-lang.rust-analyzer@0.3.2096",
"rust-lang.rust-analyzer@0.3.2104",
"tamasfe.even-better-toml@0.19.2",
"usernamehw.errorlens@3.20.0"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/acceptance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v9.0.1
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v9.0.1
with:
egress-policy: audit
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
matrix:
flavor: ["cpp", "rust"]
steps:
- uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v9.0.1
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v9.0.1
with:
egress-policy: audit
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
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 @@ -31,7 +31,7 @@ jobs:
APPLY_FIXES: all
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
- uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
if: success() || failure()
with:
sarif_file: megalinter-reports/megalinter-report.sarif
Expand All @@ -41,6 +41,6 @@ jobs:
name: Linter Report
path: |
megalinter-reports
- uses: reviewdog/action-suggester@63b8f8cc21dfa052ac44436e65ed31edcffcb6c1 # v1.17.0
- uses: reviewdog/action-suggester@db4abb16fbaabe386831e5addb7be1485d0d63d3 # v1.18.0
with:
tool_name: MegaLinter
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
- uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
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@3378cda945da322a8db4b193e19d46352ebe2de5 # v1.10.4
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
id: update-packages
with:
input-file: .devcontainer/${{ matrix.flavor }}/apt-requirements-*.json
- uses: actions/create-github-app-token@3378cda945da322a8db4b193e19d46352ebe2de5 # v1.10.4
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
- uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1
- uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7.0.2
with:
commit-message: "Update ${{ join(fromJson(steps.update-packages.outputs.updated-dependencies), ', ') }}"
branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-apt-packages
Expand All @@ -58,12 +58,12 @@ jobs:
id: update-extensions
with:
input-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata-vscode.json
- uses: actions/create-github-app-token@3378cda945da322a8db4b193e19d46352ebe2de5 # v1.10.4
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: token
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
- uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1
- uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7.0.2
with:
commit-message: "Update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }}"
branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-vscode-extensions
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
- uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
if: steps.scan.outputs.sarif != ''
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ Both containers can be used in Visual Studio Code or GitHub Codespaces without a

### Verify image signature

The container images are signed with [SigStore](https://www.sigstore.dev/) [Cosign](https://docs.sigstore.dev/signing/quickstart/) using a keyless signing method.
The container images are signed with [SigStore](https://www.sigstore.dev/) [Cosign](https://docs.sigstore.dev/cosign/signing/overview/) using a keyless signing method.

The signature can be verified with the following command (using Docker), verifying that the image is actually signed by the GitHub CI system:
The signature can be [verified](https://docs.sigstore.dev/cosign/verifying/verify/) with the following command (using Docker), verifying that the image is actually signed by the GitHub CI system:

> amp-devcontainer-cpp
Expand Down
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
@@ -1,7 +1,7 @@
{
"devDependencies": {
"@playwright/test": "^1.47.0",
"@types/node": "^22.5.4",
"@playwright/test": "^1.47.1",
"@types/node": "^22.5.5",
"dotenv": "^16.4.5",
"otpauth": "^9.3.2"
},
Expand Down

0 comments on commit ac3a373

Please sign in to comment.