Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nightly in CI #9501

Merged
merged 3 commits into from
Oct 24, 2024
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
18 changes: 18 additions & 0 deletions .github/actions/install-ninja/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 'Install ninja'
description: 'Install ninja'

runs:
using: composite
steps:
- name: Install ninja (macOS)
run: brew install ninja
if: runner.os == 'macOS'
shell: bash
- name: Install ninja (Windows)
run: choco install ninja
if: runner.os == 'Windows'
shell: bash
- name: Install ninja (Linux)
run: sudo apt-get update && sudo apt-get install -y ninja-build
if: runner.os == 'Linux'
shell: bash
2 changes: 1 addition & 1 deletion .github/actions/install-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
echo "version=nightly-2024-10-02" >> "$GITHUB_OUTPUT"
echo "version=nightly-2024-10-22" >> "$GITHUB_OUTPUT"
else
echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
fi
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,7 @@ jobs:
with:
submodules: true

- uses: ./.github/actions/install-ninja
- uses: ./.github/actions/install-rust
with:
toolchain: ${{ matrix.rust }}
Expand Down
1 change: 1 addition & 0 deletions ci/build-release-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ cargo build --release $flags --target $target -p wasmtime-cli $bin_flags --featu
mkdir -p target/c-api-build
cd target/c-api-build
cmake \
-G Ninja \
../../crates/c-api \
$cmake_flags \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/aarch64-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:16.04

RUN apt-get update -y && apt-get install -y gcc gcc-aarch64-linux-gnu ca-certificates curl make git
RUN apt-get update -y && apt-get install -y gcc gcc-aarch64-linux-gnu ca-certificates curl make git ninja-build
RUN git config --global --add safe.directory '*'

# The CMake in Ubuntu 16.04 was a bit too old for us to use so download one from
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/riscv64gc-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y gcc gcc-riscv64-linux-gnu ca-certificates cmake git
RUN apt-get update -y && apt-get install -y gcc gcc-riscv64-linux-gnu ca-certificates cmake git ninja-build
RUN git config --global --add safe.directory '*'

ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc
2 changes: 1 addition & 1 deletion ci/docker/s390x-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:16.04

RUN apt-get update -y && apt-get install -y gcc gcc-s390x-linux-gnu ca-certificates curl make git
RUN apt-get update -y && apt-get install -y gcc gcc-s390x-linux-gnu ca-certificates curl make git ninja-build
RUN git config --global --add safe.directory '*'

# The CMake in Ubuntu 16.04 was a bit too old for us to use so download one from
Expand Down
7 changes: 6 additions & 1 deletion ci/docker/x86_64-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
FROM almalinux:8

RUN dnf install -y git gcc make cmake git
RUN dnf install -y git gcc make cmake git unzip
RUN git config --global --add safe.directory '*'

WORKDIR /usr/local/bin
RUN curl -LO https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip
RUN unzip ./ninja-linux
WORKDIR /
2 changes: 1 addition & 1 deletion ci/docker/x86_64-musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apk add libgcc
# Use something glibc-based for the actual compile because the Rust toolchain
# we're using is glibc-based in CI.
FROM ubuntu:24.04
RUN apt-get update -y && apt-get install -y cmake musl-tools git
RUN apt-get update -y && apt-get install -y cmake musl-tools git ninja-build
COPY --from=libgcc_s_src /usr/lib/libgcc_s.so.1 /usr/lib/x86_64-linux-musl
RUN git config --global --add safe.directory '*'

Expand Down
Loading