Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
wasmtime-lts-1-changed: ${{ steps.filter.outputs.wasmtime-lts-1 }}
wasmtime-lts-1-git-sha: ${{ steps.versions.outputs.wasmtime-lts-1-git-sha }}
wasmtime-lts-1-version: ${{ steps.versions.outputs.wasmtime-lts-1-version }}
wasmtime-dev-git-sha: ${{ steps.versions.outputs.wasmtime-dev-git-sha }}
common-changed: ${{ steps.filter.outputs.common }}
steps:
- uses: actions/checkout@v6
Expand All @@ -35,6 +36,7 @@ jobs:
- '.github/**'
- 'Dockerfile'
- 'rust-toolchain.toml'
- 'versions/cargo-auditable/**'
wasmtime-stable:
- 'versions/stable/**'
wasmtime-stable-1:
Expand Down Expand Up @@ -73,6 +75,10 @@ jobs:
wasmtime_lts_1_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/v${wasmtime_lts_1_version}" --template '{{.sha}}')"
echo "wasmtime-lts-1-version=${wasmtime_lts_1_version}" | tee -a "${GITHUB_OUTPUT}"
echo "wasmtime-lts-1-git-sha=${wasmtime_lts_1_git_sha}" | tee -a "${GITHUB_OUTPUT}"

# dev
wasmtime_dev_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/dev" --template '{{.sha}}')"
echo "wasmtime-dev-git-sha=${wasmtime_dev_git_sha}" | tee -a "${GITHUB_OUTPUT}"
env:
GH_TOKEN: ${{ github.token }}

Expand All @@ -86,22 +92,26 @@ jobs:
fail-fast: false
matrix:
include:
- wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-version }}
- tag: v${{ needs.preflight.outputs.wasmtime-stable-version }}
wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-version }}
wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-stable-git-sha }}
tag: v${{ needs.preflight.outputs.wasmtime-stable-version }}
force: ${{ needs.preflight.outputs.wasmtime-stable-changed == 'true' || needs.preflight.outputs.common-changed == 'true' }}
- wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-1-version }}
- tag: v${{ needs.preflight.outputs.wasmtime-stable-1-version }}
wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-1-version }}
wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-stable-1-git-sha }}
tag: v${{ needs.preflight.outputs.wasmtime-stable-1-version }}
force: ${{ needs.preflight.outputs.wasmtime-stable-1-changed == 'true' || needs.preflight.outputs.common-changed == 'true' }}
- wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-version }}
- tag: v${{ needs.preflight.outputs.wasmtime-lts-version }}
wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-version }}
wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-lts-git-sha }}
tag: v${{ needs.preflight.outputs.wasmtime-lts-version }}
force: ${{ needs.preflight.outputs.wasmtime-lts-changed == 'true' || needs.preflight.outputs.common-changed == 'true' }}
- wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-1-version }}
- tag: v${{ needs.preflight.outputs.wasmtime-lts-1-version }}
wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-1-version }}
wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-lts-1-git-sha }}
tag: v${{ needs.preflight.outputs.wasmtime-lts-1-version }}
force: ${{ needs.preflight.outputs.wasmtime-lts-1-changed == 'true' || needs.preflight.outputs.common-changed == 'true' }}
- tag: dev-${{ needs.preflight.outputs.wasmtime-dev-git-sha }}
wasmtime-crate: ''
wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-dev-git-sha }}
force: ${{ needs.preflight.outputs.common-changed == 'true' }}
uses: ./.github/workflows/publish.yaml
with:
rust-version: "${{ needs.preflight.outputs.rust-version }}"
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ ARG wasmtime_crate wasmtime_git_rev cargo_auditable_version
RUN \
cargo install --locked "cargo-auditable@${cargo_auditable_version}" ; \
if [ "${wasmtime_crate}" = "" ] ; then \
cargo auditable install \
# restore 'cargo auditable' https://github.com/rust-secure-code/cargo-auditable/issues/257
cargo install \
--git https://github.com/bytecodealliance/wasmtime.git \
--rev "${wasmtime_git_rev}" \
--locked \
Expand Down