github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: updated nightly references version

Browse Source
This commit is contained in:
skoupidi
2025-04-11 19:28:37 +03:00
parent b8331f71b9
commit 15d3e2ea95
14 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/book.yml vendored
View File

@@ -23,14 +23,14 @@ jobs:
- name: Install Rust (nightly) - name: Install Rust (nightly)
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
components: rustfmt, clippy components: rustfmt, clippy
override: true override: true
- name: Install Rust (wasm32) - name: Install Rust (wasm32)
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
target: wasm32-unknown-unknown target: wasm32-unknown-unknown
override: true override: true
@@ -56,7 +56,7 @@ jobs:
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "bookworm" git config --local user.name "bookworm"
cd doc cd doc
make CARGO="cargo +nightly-2024-12-05" github make CARGO="cargo +nightly-2025-04-10" github
git checkout gh-pages git checkout gh-pages
- name: Push changes - name: Push changes

18
.github/workflows/ci.yml vendored
View File

@@ -13,11 +13,11 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
override: true override: true
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
target: wasm32-unknown-unknown target: wasm32-unknown-unknown
override: true override: true
- uses: actions/setup-python@v1 - uses: actions/setup-python@v1
@@ -37,11 +37,11 @@ jobs:
- name: Run test units - name: Run test units
run: | run: |
make CARGO="cargo +nightly-2024-12-05" test make CARGO="cargo +nightly-2025-04-10" test
- name: Compile all bins - name: Compile all bins
run: | run: |
make CARGO="cargo +nightly-2024-12-05" make CARGO="cargo +nightly-2025-04-10"
feature-powerset: feature-powerset:
name: Test crate feature powerset on ${{ matrix.os }} name: Test crate feature powerset on ${{ matrix.os }}
@@ -54,11 +54,11 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
override: true override: true
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
target: wasm32-unknown-unknown target: wasm32-unknown-unknown
override: true override: true
- uses: taiki-e/install-action@cargo-hack - uses: taiki-e/install-action@cargo-hack
@@ -75,7 +75,7 @@ jobs:
- name: Run feature powerset builds - name: Run feature powerset builds
run: | run: |
make CARGO="cargo +nightly-2024-12-05" check make CARGO="cargo +nightly-2025-04-10" check
fmt: fmt:
name: rustfmt name: rustfmt
@@ -85,8 +85,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly-2024-12-05 toolchain: nightly-2025-04-10
components: rustfmt components: rustfmt
override: true override: true
- run: | - run: |
cargo +nightly-2024-12-05 fmt -- --check cargo +nightly-2025-04-10 fmt -- --check

2
.github/workflows/lints-nightly.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly toolchain: nightly-2025-04-10
components: clippy components: clippy
override: true override: true
- name: Run Clippy - name: Run Clippy

10
README.md
View File

@@ -117,25 +117,25 @@ to happen from time to time. As a workaround, we can configure an older
nightly version, which was known to work: nightly version, which was known to work:
```shell ```shell
% rustup toolchain install nightly-2024-12-05 % rustup toolchain install nightly-2025-04-10
% rustup target add wasm32-unknown-unknown --toolchain nightly-2024-12-05 % rustup target add wasm32-unknown-unknown --toolchain nightly-2025-04-10
``` ```
Now we can use that toolchain in `make` directly: Now we can use that toolchain in `make` directly:
```shell ```shell
% make CARGO="cargo +nightly-2024-12-05" {target} % make CARGO="cargo +nightly-2025-04-10" {target}
``` ```
Or, if we are lazy, we can modify the `Makefile` to always use that: Or, if we are lazy, we can modify the `Makefile` to always use that:
```shell ```shell
% sed -i Makefile -e "s|nightly|nightly-2024-12-05|g" % sed -i Makefile -e "s|nightly|nightly-2025-04-10|g"
``` ```
Under no circumstances commit or push the Makefile change. Under no circumstances commit or push the Makefile change.
When using `cargo` directly, you have to add the `+nightly-2024-12-05` flag, When using `cargo` directly, you have to add the `+nightly-2025-04-10` flag,
in order for it to use the older nightly version. in order for it to use the older nightly version.
## Install ## Install

2
bin/app/Dockerfile
View File

@@ -10,7 +10,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
RUN curl -o rustup.sh --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs RUN curl -o rustup.sh --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs
RUN chmod +x rustup.sh RUN chmod +x rustup.sh
RUN ./rustup.sh -y --default-toolchain nightly-2025-03-27 RUN ./rustup.sh -y --default-toolchain nightly-2025-04-10
#RUN rustup toolchain install nightly #RUN rustup toolchain install nightly
#RUN rustup default nightly #RUN rustup default nightly

3
bin/app/rust-toolchain.toml
View File

@@ -1,3 +1,2 @@
[toolchain] [toolchain]
channel = "nightly-2025-03-27" channel = "nightly-2025-04-10"
#channel = "nightly-2024-12-05"

2
contrib/docker/Dockerfile.almalinux
View File

@@ -1,7 +1,7 @@
# Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:almalinux -f ./contrib/docker/Dockerfile.almalinux --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:almalinux -f ./contrib/docker/Dockerfile.almalinux --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg OS_VER=almalinux/8-minimal --build-arg RUST_VER=nightly # optionally with: --build-arg OS_VER=almalinux/8-minimal --build-arg RUST_VER=nightly
ARG RUST_VER=nightly-2024-12-05 # stable nightly beta 1.72 ARG RUST_VER=nightly-2025-04-10 # stable nightly beta 1.72
ARG OS_VER=almalinux/9-minimal # almalinux/8-minimal ARG OS_VER=almalinux/9-minimal # almalinux/8-minimal
FROM ${OS_VER} as rust_builder FROM ${OS_VER} as rust_builder

2
contrib/docker/Dockerfile.alpine
View File

@@ -1,7 +1,7 @@
# Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:alpine -f ./contrib/docker/Dockerfile.alpine --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:alpine -f ./contrib/docker/Dockerfile.alpine --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg ALPINE_VER=3.18 --build-arg RUST_VER=nightly # optionally with: --build-arg ALPINE_VER=3.18 --build-arg RUST_VER=nightly
ARG RUST_VER=nightly-2024-12-05 # 1.72 nightly stable ARG RUST_VER=nightly-2025-04-10 # 1.72 nightly stable
ARG ALPINE_VER=3.18 # 3.17 ARG ALPINE_VER=3.18 # 3.17
FROM alpine:${ALPINE_VER} as rust_builder FROM alpine:${ALPINE_VER} as rust_builder

2
contrib/docker/Dockerfile.alpineARMviaEmulation
View File

@@ -2,7 +2,7 @@
# Use: docker build . --platform=linux/arm64 --pull -t darkfi:alpine_arm64 -f ./contrib/docker/Dockerfile.alpineARMviaEmulation --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --platform=linux/arm64 --pull -t darkfi:alpine_arm64 -f ./contrib/docker/Dockerfile.alpineARMviaEmulation --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg OS_VER=3.18 --build-arg RUST_VER=nightly # optionally with: --build-arg OS_VER=3.18 --build-arg RUST_VER=nightly
ARG RUST_VER=nightly-2024-12-05 # 1.72 beta stable nightly ARG RUST_VER=nightly-2025-04-10 # 1.72 beta stable nightly
ARG OS_VER=3.18 # 3.17 ARG OS_VER=3.18 # 3.17
ARG REPOSITORY=arm64v8/alpine ARG REPOSITORY=arm64v8/alpine

2
contrib/docker/Dockerfile.debian
View File

@@ -1,7 +1,7 @@
# Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:debian -f ./contrib/docker/Dockerfile.debian --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:debian -f ./contrib/docker/Dockerfile.debian --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg OS_VER=bullseye-slim --build-arg RUST_VER=nightly # optionally with: --build-arg OS_VER=bullseye-slim --build-arg RUST_VER=nightly
ARG RUST_VER=nightly-2024-12-05 # nightly 1.72 ARG RUST_VER=nightly-2025-04-10 # nightly 1.72
ARG OS_VER=bookworm-slim # (12); bullseye-slim (11); buster-slim (10) ARG OS_VER=bookworm-slim # (12); bullseye-slim (11); buster-slim (10)
FROM debian:${OS_VER} as rust_builder FROM debian:${OS_VER} as rust_builder

2
contrib/docker/Dockerfile.fedora
View File

@@ -2,7 +2,7 @@
# optionally with: --build-arg OS_VER=fedora:37 --build-arg RUST_VER=nightly # optionally with: --build-arg OS_VER=fedora:37 --build-arg RUST_VER=nightly
# To use the legacy deprecated builder: DOCKER_BUILDKIT=0 # To use the legacy deprecated builder: DOCKER_BUILDKIT=0
ARG RUST_VER=nightly-2024-12-05 # stable nightly beta 1.72 ARG RUST_VER=nightly-2025-04-10 # stable nightly beta 1.72
ARG OS_VER=fedora:38 # fedora:37 ARG OS_VER=fedora:38 # fedora:37
FROM ${OS_VER} as rust_builder FROM ${OS_VER} as rust_builder

2
contrib/docker/Dockerfile.ubuntu
View File

@@ -1,7 +1,7 @@
# Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:ubuntu -f ./contrib/docker/Dockerfile.ubuntu --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:ubuntu -f ./contrib/docker/Dockerfile.ubuntu --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg OS_VER=20.04 --build-arg RUST_VER=nightly # optionally with: --build-arg OS_VER=20.04 --build-arg RUST_VER=nightly
ARG RUST_VER=nightly-2024-12-05 # stable nightly beta 1.72 ARG RUST_VER=nightly-2025-04-10 # stable nightly beta 1.72
ARG OS_VER=22.04 # 20.04 ARG OS_VER=22.04 # 20.04
FROM ubuntu:${OS_VER} as rust_builder FROM ubuntu:${OS_VER} as rust_builder

2
contrib/docker/Dockerfile.ubuntuARMviaEmulation
View File

@@ -2,7 +2,7 @@
# Use: docker build . --platform=linux/arm64 --pull -t darkfi:ubuntu_arm64 -f contrib/docker/Dockerfile.ubuntuARMviaEmulation --build-arg DONT_EXEC_TESTS=1 # Use: docker build . --platform=linux/arm64 --pull -t darkfi:ubuntu_arm64 -f contrib/docker/Dockerfile.ubuntuARMviaEmulation --build-arg DONT_EXEC_TESTS=1
# optionally with: --build-arg BUILD_OS_VER=20.04 --build-arg RUST_VER=1.70 # optionally with: --build-arg BUILD_OS_VER=20.04 --build-arg RUST_VER=1.70
ARG RUST_VER=nightly-2024-12-05 # stable nightly beta 1.72 ARG RUST_VER=nightly-2025-04-10 # stable nightly beta 1.72
ARG OS_VER=22.04 # 20.04 ARG OS_VER=22.04 # 20.04
FROM --platform=$TARGETPLATFORM ubuntu:${OS_VER} as rust_builder FROM --platform=$TARGETPLATFORM ubuntu:${OS_VER} as rust_builder

2
contrib/docker/riscv.Dockerfile
View File

@@ -9,7 +9,7 @@
# Arguments configuration # Arguments configuration
ARG DEBIAN_VER=sid ARG DEBIAN_VER=sid
ARG RUST_VER=nightly-2024-12-05 ARG RUST_VER=nightly-2025-04-10
#TODO: only darkirc has been tested, have to check rest binaries to add deps and ports. #TODO: only darkirc has been tested, have to check rest binaries to add deps and ports.
ARG BINS=darkirc ARG BINS=darkirc