Skip to content

Commit 8311069

Browse files
committed
chore: fix more issues
1 parent 6a2093b commit 8311069

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- name: Update package details in release
8282
run: |
8383
set -Eeuo pipefail
84-
UPDATED_NOTES=$(gh release view ${REF_NAME} --json body -q '.body')
84+
UPDATED_NOTES=$(gh release view "${REF_NAME}" --json body -q '.body')
8585
UPDATED_NOTES=${UPDATED_NOTES//"{{ amp-devcontainer-${CONTAINER_FLAVOR}-version }}"/"${REF_NAME}"}
8686
UPDATED_NOTES=${UPDATED_NOTES//"{{ amp-devcontainer-${CONTAINER_FLAVOR}-sha }}"/"${DIGEST}"}
8787
gh release edit "${REF_NAME}" --notes "${UPDATED_NOTES}"

.github/workflows/wc-acceptance-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
done
7373
env:
7474
GH_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
75-
- run: cd test/${CONTAINER_FLAVOR}/features && npm test
75+
- run: cd "test/${CONTAINER_FLAVOR}/features" && npm test
7676
env:
7777
CONTAINER_FLAVOR: ${{ inputs.flavor }}
7878
GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}

.github/workflows/wc-build-push.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
images: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}
4949
# Generate image LABEL for devcontainer.metadata
5050
# the sed expression is a workaround for quotes being eaten in arrays (e.g. ["x", "y", "z"] -> ["x",y,"z"])
51-
- run: echo "metadata=$(jq -cj '[.]' .devcontainer/${CONTAINER_FLAVOR}/devcontainer-metadata-vscode.json | sed 's/,"/, "/g')" >> "$GITHUB_OUTPUT"
51+
- run: echo "metadata=$(jq -cj '[.]' ".devcontainer/${CONTAINER_FLAVOR}/devcontainer-metadata-vscode.json" | sed 's/,"/, "/g')" >> "$GITHUB_OUTPUT"
5252
id: devcontainer-metadata
5353
- run: echo "git-commit-epoch=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
5454
id: devcontainer-epoch
@@ -152,7 +152,7 @@ jobs:
152152
id: inspect-manifest
153153
run: |
154154
set -Eeuo pipefail
155-
output=$(docker buildx imagetools inspect ${REGISTRY}/${{ github.repository }}-${CONTAINER_FLAVOR}:${{ steps.metadata.outputs.version }} --format '{{json .}}')
155+
output=$(docker buildx imagetools inspect "${REGISTRY}/${{ github.repository }}-${CONTAINER_FLAVOR}:${{ steps.metadata.outputs.version }}" --format '{{json .}}')
156156
echo "digest=$(echo "$output" | jq -r '.manifest.digest // .manifests[0].digest')" >> "$GITHUB_OUTPUT"
157157
- uses: ./.github/actions/container-size-diff
158158
id: container-size-diff
@@ -175,6 +175,7 @@ jobs:
175175
show-summary: false
176176
push-to-registry: true
177177
- name: Verify attestation
178-
run: gh attestation verify --repo ${{ github.repository }} oci://${REGISTRY}/${{ github.repository }}-${CONTAINER_FLAVOR}@${{ steps.inspect-manifest.outputs.digest }}
178+
run: gh attestation verify --repo ${{ github.repository }} "oci://${REGISTRY}/${{ github.repository }}-${CONTAINER_FLAVOR}@${DIGEST}"
179179
env:
180+
DIGEST: ${{ steps.inspect-manifest.outputs.digest }}
180181
GH_TOKEN: ${{ github.token }}

.github/workflows/wc-integration-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
path: ${{ runner.temp }}
3535
pattern: digests-${{ inputs.flavor }}-${{ steps.runner-arch.outputs.arch }}
36-
- run: echo "container=$(printf 'ghcr.io/${{ github.repository }}-${CONTAINER_FLAVOR}@sha256:%s ' *)" >> "$GITHUB_OUTPUT"
36+
- run: echo "container=$(printf "ghcr.io/${{ github.repository }}-${CONTAINER_FLAVOR}@sha256:%s " *)" >> "$GITHUB_OUTPUT"
3737
working-directory: ${{ runner.temp }}/digests-${{ inputs.flavor }}-${{ steps.runner-arch.outputs.arch }}
3838
id: set-container
3939
run-test:
@@ -54,7 +54,7 @@ jobs:
5454
key: xwin-cache-${{ inputs.runner }}
5555
restore-keys: |
5656
xwin-cache
57-
- run: bats --formatter junit test/${CONTAINER_FLAVOR}/integration-tests.bats | tee test-report-${CONTAINER_FLAVOR}-${RUNNER}.xml
57+
- run: bats --formatter junit "test/${CONTAINER_FLAVOR}/integration-tests.bats" | tee "test-report-${CONTAINER_FLAVOR}-${RUNNER}.xml"
5858
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5959
if: always()
6060
with:

0 commit comments

Comments
 (0)