Skip to content

Commit

Permalink
Merge branch 'main' into feature/write-e2e-tests-with-bdd
Browse files Browse the repository at this point in the history
  • Loading branch information
rjaegers committed Sep 24, 2024
2 parents 7fe3cc1 + 04e2fcf commit 44fe897
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/cpp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:24.04@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee
FROM ubuntu:24.04@sha256:dfc10878be8d8fc9c61cbff33166cb1d1fe44391539243703c72766894fa834a

ARG BATS_VERSION=1.11.0
ARG CCACHE_VERSION=4.10.1
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/cpp/devcontainer-metadata-vscode.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected].51",
"[email protected].52",
"[email protected]",
"[email protected].5936",
"[email protected].5940",
"[email protected]",
"[email protected]"
],
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:24.04@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee
FROM ubuntu:24.04@sha256:dfc10878be8d8fc9c61cbff33166cb1d1fe44391539243703c72766894fa834a

ARG BATS_VERSION=1.11.0
ARG CARGO_BINSTALL_VERSION=1.6.8
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 @@ -6,8 +6,8 @@
"vscode": {
"extensions": [
"[email protected]",
"[email protected].5936",
"[email protected].2104",
"[email protected].5940",
"[email protected].2112",
"[email protected]",
"[email protected]"
]
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 @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: 20
- run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .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@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
- uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.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@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
- uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
- uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7.0.2
- uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
with:
commit-message: "Update ${{ join(fromJson(steps.update-packages.outputs.updated-dependencies), ', ') }}"
branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-apt-packages
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
with:
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
- uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7.0.2
- uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
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@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
- uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
if: steps.scan.outputs.sarif != ''
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
24 changes: 12 additions & 12 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@playwright/test": "^1.47.1",
"@playwright/test": "^1.47.2",
"@types/node": "^22.5.5",
"dotenv": "^16.4.5",
"otpauth": "^9.3.2",
Expand Down

0 comments on commit 44fe897

Please sign in to comment.