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.

Sign up for GitHub

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

rsc: Enable RSC to build with rust 1.8 #1621

Merged
merged 4 commits into from
Aug 5, 2024
Merged

rsc: Enable RSC to build with rust 1.8 #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceaed36
rsc: Enable RSC to build with rust 1.8
V-FEXrt Aug 2, 2024
3a642cc
missed one
V-FEXrt Aug 2, 2024
52f1920
update docker files
V-FEXrt Aug 2, 2024
93a198e
temporarily disable alpine
V-FEXrt Aug 5, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ jobs:
strategy:
matrix:
include:
- target: alpine
dockerfile: alpine
extra_docker_build_args: ''
extra_docker_run_args: ''
build_cmd: make -C wake-* static
test_cmd: tar xvJf wake-*/wake-static_* && cd tests && ../wake-*/bin/wake -x Unit
install_src_glob: build/wake-*/wake-static_*
# - target: alpine
# dockerfile: alpine
# extra_docker_build_args: ''
# extra_docker_run_args: ''
# build_cmd: make -C wake-* static
# test_cmd: tar xvJf wake-*/wake-static_* && cd tests && ../wake-*/bin/wake -x Unit
# install_src_glob: build/wake-*/wake-static_*

- target: debian_bullseye
dockerfile: debian-bullseye
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add m4 g++ make pkgconf git tar xz gmp-dev re2-dev sqlite-dev fuse-dev n

WORKDIR /build

ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-musl"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/debian-bullseye
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y build-essential m4 devscripts git fuse


WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/fedora-38
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN rpmdev-setuptree


WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/rocky-8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN rpmdev-setuptree


WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/rocky-9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN dnf install -y rpm-build rpm-devel rpmlint make python3 bash diffutils patch
RUN rpmdev-setuptree

WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/ubuntu-22.04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:22.04
RUN apt-get update && apt-get install -y build-essential m4 debhelper devscripts git fuse libfuse-dev libgmp-dev libncurses5-dev libre2-dev libsqlite3-dev pkg-config squashfuse wget iproute2 jq libssl-dev

WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/wasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y build-essential devscripts git fuse lib
RUN useradd -m -d /build build

WORKDIR /build
ENV VERSION=1.70.0
ENV VERSION=1.80.0
ENV RUST_FOLDER="rust-$VERSION-x86_64-unknown-linux-gnu"
ENV RUST_TAR="$RUST_FOLDER.tar.gz"
RUN wget "https://static.rust-lang.org/dist/$RUST_TAR"
Expand Down
Loading
Loading