Skip to content

Commit

Permalink
Merge branch 'main' into docs/improve-spec-precision
Browse files Browse the repository at this point in the history
  • Loading branch information
toddbaert authored Dec 5, 2023
2 parents 9bd8b07 + 2293f0e commit 853e99c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev-benches-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
with:
ref: gh-pages
- name: Setup Pages
uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382 # v3
uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4
- name: Upload artifact
uses: actions/upload-pages-artifact@a753861a5debcf57bf8b404356158c8e1e33150c # v2
with:
path: './dev/bench'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@de14547edc9944350dc0481aa5b7afb08e75f254 # v2
uses: actions/deploy-pages@77d7344265e1f960dab5c00dbff52287a70b0d4f # v3
6 changes: 2 additions & 4 deletions .github/workflows/release-please.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ jobs:
- uses: google-github-actions/release-please-action@a6d1fd9854c8c40688a72f7e4b072a1e965860a0 # v4
id: release
with:
release-type: "go"
command: manifest
token: ${{secrets.GITHUB_TOKEN}}
default-branch: main

Expand Down Expand Up @@ -88,7 +86,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3
uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4
with:
images: ${{ env.REGISTRY }}/${{ matrix.path }}

Expand Down Expand Up @@ -134,7 +132,7 @@ jobs:
run: echo "IMG_SBOM_FILE=${{ format('{0}-{1}-sbom.spdx', matrix.path, env.VERSION) }}" >> $GITHUB_OUTPUT

- name: SBOM for latest image
uses: anchore/sbom-action@fd74a6fb98a204a1ad35bbfae0122c1a302ff88b # v0
uses: anchore/sbom-action@5ecf649a417b8ae17dc8383dc32d46c03f2312df # v0
with:
image: ${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ matrix.path }}:${{ env.VERSION }}
artifact-name: ${{ steps.image-sbom-file-gen.outputs.IMG_SBOM_FILE }}
Expand Down

0 comments on commit 853e99c

Please sign in to comment.