Merge branch 'master' into rsc-blob-id-index

sifive · Aug 5, 2024 · eef81a5 · eef81a5
2 parents daff3c5 + d46a0c6
commit eef81a5
Show file tree

Hide file tree

Showing 13 changed files with 2,319 additions and 1,656 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -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

diff --git a/.github/workflows/dockerfiles/alpine b/.github/workflows/dockerfiles/alpine
@@ -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"

diff --git a/.github/workflows/dockerfiles/debian-bullseye b/.github/workflows/dockerfiles/debian-bullseye
@@ -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"

diff --git a/.github/workflows/dockerfiles/fedora-38 b/.github/workflows/dockerfiles/fedora-38
@@ -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"

diff --git a/.github/workflows/dockerfiles/rocky-8 b/.github/workflows/dockerfiles/rocky-8
@@ -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"

diff --git a/.github/workflows/dockerfiles/rocky-9 b/.github/workflows/dockerfiles/rocky-9
@@ -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"

diff --git a/.github/workflows/dockerfiles/ubuntu-22.04 b/.github/workflows/dockerfiles/ubuntu-22.04
@@ -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"

diff --git a/.github/workflows/dockerfiles/wasm b/.github/workflows/dockerfiles/wasm
@@ -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"