stable change

tari-project · Jan 29, 2025 · e2ff413 · e2ff413
1 parent 2a68bdf
commit e2ff413
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build_binaries.json b/.github/workflows/build_binaries.json
@@ -2,7 +2,7 @@
   {
     "name": "linux-x86_64",
     "runs-on": "ubuntu-20.04",
-    "rust": "nightly-2024-07-07",
+    "rust": "stable",
     "target": "x86_64-unknown-linux-gnu",
     "cross": false,
     "build_metric": true

diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml
@@ -29,7 +29,7 @@ env:
   # TS_BUILD: "debug"
   TS_BUILD: "release"
   TARI_NETWORK_DIR: testnet
-  toolchain: nightly-2024-07-07
+  toolchain: stable
   matrix-json-file: ".github/workflows/build_binaries.json"
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/build_dockers.yml b/.github/workflows/build_dockers.yml
@@ -48,7 +48,7 @@ name: Build docker images
           - xmrig
 
 env:
-  toolchain_default: nightly-2024-07-07
+  toolchain_default: stable
 
 concurrency:
   # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix

diff --git a/.github/workflows/build_dockers_workflow.yml b/.github/workflows/build_dockers_workflow.yml
@@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
       toolchain:
         type: string
         description: 'Rust toolchain'
-        default: nightly-2024-07-07
+        default: stable
       arch:
         type: string
         default: x86-64

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ name: CI
   merge_group:
 
 env:
-  toolchain: nightly-2024-07-07
+  toolchain: stable
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_TERM_COLOR: always
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ name: Source Coverage
       - ci-coverage-*
 
 env:
-  toolchain: nightly-2024-07-07
+  toolchain: stable
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -27,7 +27,7 @@ name: Integration tests
         type: string
 
 env:
-  toolchain: nightly-2024-07-07
+  toolchain: stable
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/base_layer/core/src/chain_storage/horizon_data.rs b/base_layer/core/src/chain_storage/horizon_data.rs
@@ -56,6 +56,5 @@ mod test {
         obj.kernel_sum();
         obj.utxo_sum();
         drop(obj.clone());
-        format!("{:?}", obj);
     }
 }
diff --git a/base_layer/wallet_ffi/README.md b/base_layer/wallet_ffi/README.md
@@ -132,8 +132,8 @@ Install [Rust](https://www.rust-lang.org/tools/install)
 
 Install the following tools and system images
 ```Shell Script
-rustup toolchain add nightly-2024-07-07
-rustup default nightly-2024-07-07
+rustup toolchain add stable
+rustup default stable
 rustup component add rustfmt --toolchain nightly
 rustup component add clippy
 rustup target add x86_64-apple-ios aarch64-apple-ios # iPhone and emulator cross compiling

diff --git a/buildtools/docker/base_node.Dockerfile b/buildtools/docker/base_node.Dockerfile
@@ -1,13 +1,13 @@
 # syntax=docker/dockerfile:1
 #FROM rust:1.42.0 as builder
-FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-07-07 as builder
+FROM quay.io/tarilabs/rust_tari-build-with-deps:stable as builder
 
 # Copy the dependency lists
 #ADD Cargo.toml ./
 ADD . /minotari_node
 WORKDIR /minotari_node
 
-# RUN rustup component add rustfmt --toolchain nightly-2024-07-07-x86_64-unknown-linux-gnu
+# RUN rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
 #ARG TBN_ARCH=native
 ARG TBN_ARCH=x86-64
 #ARG TBN_FEATURES=avx2

diff --git a/buildtools/windows-dev-environment-notes.md b/buildtools/windows-dev-environment-notes.md
@@ -396,7 +396,7 @@ sample output:
 ```
 PS C:\Users\leet> cd src\tari
 PS C:\Users\leet\src\tari> cargo build --release --bin minotari_miner
-info: syncing channel updates for 'nightly-2024-07-07-x86_64-pc-windows-msvc'
+info: syncing channel updates for 'stable-x86_64-pc-windows-msvc'
 info: latest update on 2024-07-07, rust version 1.81.0-nightly (ed7e35f34 2024-07-06)
 info: downloading component 'cargo'
 info: downloading component 'clippy'

diff --git a/integration_tests/src/chat_ffi.rs b/integration_tests/src/chat_ffi.rs
@@ -456,6 +456,7 @@ pub struct ChatCallback {
     pub read_confirmation_received: Mutex<u64>,
 }
 
+#[allow(static_mut_refs)]
 impl ChatCallback {
     pub fn instance() -> &'static mut Self {
         unsafe {

diff --git a/integration_tests/src/ffi/callbacks.rs b/integration_tests/src/ffi/callbacks.rs
@@ -332,6 +332,7 @@ impl Callbacks {
         println!("wallet {:?}", self.wallet);
     }
 
+    #[allow(static_mut_refs)]
     pub fn instance() -> &'static mut Self {
         unsafe {
             START.call_once(|| {

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -13,4 +13,4 @@
 # - the CI files in .github folder
 # - the Makefile in base_layer/key_manager/Makefile
 [toolchain]
-channel = "nightly-2024-07-07"
+channel = "stable"
diff --git a/scripts/test_in_docker.sh b/scripts/test_in_docker.sh
@@ -2,8 +2,8 @@
 
 # Run the Tari test suite locally inside a suitable docker container
 
-IMAGE=quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-07-07
-TOOLCHAIN_VERSION=nightly-2024-07-07
+IMAGE=quay.io/tarilabs/rust_tari-build-with-deps:stable
+TOOLCHAIN_VERSION=stable
 CONTAINER=tari_test
 
 echo "Deleting old container"