Skip to content

Commit ea48705

Browse files
authored
Merge branch 'main' into dependabot/github_actions/github-actions-06ae9f9a40
2 parents 6c5abd5 + 37222b8 commit ea48705

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/build-push.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ jobs:
135135
env:
136136
GH_TOKEN: ${{ github.token }}
137137
run: |
138-
gh attestation verify --repo ${{ github.repository }} oci://${{ env.REGISTRY }}/${{ github.repository }}-${{ matrix.flavor }}@${{ steps.build-and-push.outputs.digest }} --format json --jq '.[] | .attestation.bundle.dsseEnvelope | select(.payloadType == "application/vnd.in-toto+json").payload' | base64 -d | jq . > ${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ matrix.flavor }}_sha256_${{ steps.build-and-push.outputs.digest }}.intoto.jsonl
138+
RAW_SHA=${{ steps.build-and-push.outputs.digest }}
139+
FORMATTED_SHA=${RAW_SHA//:/_}
140+
gh attestation verify --repo ${{ github.repository }} oci://${{ env.REGISTRY }}/${{ github.repository }}-${{ matrix.flavor }}@${{ steps.build-and-push.outputs.digest }} --format json --jq '.[] | .attestation.bundle.dsseEnvelope | select(.payloadType == "application/vnd.in-toto+json").payload' | base64 -d | jq . > "${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ matrix.flavor }}_${FORMATTED_SHA}.intoto.jsonl"
139141
gh release upload ${{ github.ref_name }} ./*.intoto.jsonl
140142
- name: Update package details in release
141143
if: startsWith(github.ref, 'refs/tags/')

.github/workflows/release-please.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
create-release:
1717
runs-on: ubuntu-latest
1818
steps:
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
with:
21+
persist-credentials: false
1922
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
2023
id: token
2124
with:

test/cpp/features/steps/fixtures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const test = base.extend<{ codespacePage: CodespacePage }, { authenticati
1313
codespacePage: async ({ page }, use) => {
1414
const codespacePage = new CodespacePage(page);
1515
await codespacePage.goto();
16-
await codespacePage.areExtensionsActive(['SonarQube', 'CMake', 'Live Share', 'GitHub Pull Requests']);
16+
await codespacePage.areExtensionsActive(['SonarQube', 'CMake', 'Live Share', 'GitHub']);
1717

1818
await use(codespacePage);
1919

test/cpp/integration-tests.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ setup_file() {
66
# Installing the Windows SDK/CRT takes a long time.
77
# When still valid, use the installation from cache.
88

9-
xwin --accept-license --cache-dir ${BATS_TEST_DIRNAME}/.xwin-hash list
9+
xwin --accept-license --manifest-version 16 --cache-dir ${BATS_TEST_DIRNAME}/.xwin-hash list
1010
HASH_LIST_MANIFEST=$(sha256sum ${BATS_TEST_DIRNAME}/.xwin-hash/dl/manifest*.json | awk '{ print $1 }')
1111
HASH_CACHED_MANIFEST=
1212

@@ -15,7 +15,7 @@ setup_file() {
1515
fi
1616

1717
if [[ $HASH_LIST_MANIFEST != $HASH_CACHED_MANIFEST ]]; then
18-
xwin --accept-license --cache-dir ${BATS_TEST_DIRNAME}/.xwin-cache splat --preserve-ms-arch-notation
18+
xwin --accept-license --manifest-version 16 --cache-dir ${BATS_TEST_DIRNAME}/.xwin-cache splat --preserve-ms-arch-notation
1919
fi
2020

2121
ln -sf ${BATS_TEST_DIRNAME}/.xwin-cache/splat/ /winsdk

0 commit comments

Comments
 (0)