Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

Merged
TheBlueMatt merged 6 commits into from
Mar 17, 2023
Merged

Bump MSRV to 1.48 and replace most of CI with a bash script #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11a0d26
Bump MSRV to 1.48
TheBlueMatt Mar 15, 2023
fb4f34c
Remove `build-net-tokio` flag in CI since its now always true
TheBlueMatt Mar 15, 2023
263173f
Remove `build-no-std` CI flag now that its always true
TheBlueMatt Mar 15, 2023
4e32de7
Remove `build-features` CI flag now that its always true
TheBlueMatt Mar 15, 2023
28cc71f
Fix onion_message functional_tests `no-std` build
TheBlueMatt Mar 15, 2023
6558b51
Replace the bulk of CI with a (much simpler) bash script
TheBlueMatt Mar 15, 2023
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
233 changes: 23 additions & 210 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ ubuntu-latest ]
toolchain: [ stable,
beta,
# 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
1.41.1,
# 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
1.45.2,
# 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
1.47.0]
platform: [ ubuntu-latest, windows-latest, macos-latest ]
toolchain: [ stable, beta ]
include:
- toolchain: stable
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: true
platform: ubuntu-latest
coverage: true
- toolchain: stable
platform: macos-latest
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: true
- toolchain: stable
test-custom-message: true
- toolchain: beta
platform: macos-latest
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: true
- toolchain: stable
# 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
- toolchain: 1.48.0
platform: ubuntu-latest
# Windows requires 1.49.0 because that's the MSRV for supported Tokio
- toolchain: 1.49.0
platform: windows-latest
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: false
- toolchain: beta
platform: windows-latest
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: false
- toolchain: beta
build-net-tokio: true
build-no-std: true
build-futures: true
build-tx-sync: true
- toolchain: beta
test-custom-message: true
- toolchain: 1.41.1
build-no-std: false
test-log-variants: true
build-futures: false
build-tx-sync: false
- toolchain: 1.45.2
build-net-old-tokio: true
build-net-tokio: true
build-no-std: false
build-futures: true
build-tx-sync: false
- toolchain: 1.47.0
build-futures: true
build-no-std: true
build-tx-sync: false
# MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
- toolchain: 1.54.0
platform: macos-latest
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
toolchain: ${{ matrix.toolchain }}
override: true
profile: minimal
- name: Pin tokio to 1.14 for Rust 1.45
if: "matrix.build-net-old-tokio"
run: cargo update -p tokio --precise "1.14.0" --verbose
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
- name: Pin tokio to 1.26 for Windows
if: "matrix.platform == 'windows-latest'"
run: cargo update -p tokio --precise "1.26.0" --verbose
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio
if: "matrix.build-net-tokio && !matrix.coverage"
run: cargo build --verbose --color always
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
if: matrix.coverage
run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
- name: Build on Rust ${{ matrix.toolchain }}
if: "! matrix.build-net-tokio"
run: |
cargo build --verbose --color always -p lightning
cargo build --verbose --color always -p lightning-invoice
cargo build --verbose --color always -p lightning-persister
- name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
if: matrix.test-log-variants
run: |
cd lightning
for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
cargo build --verbose --color always --features $FEATURE
done
- name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
if: "matrix.build-net-tokio && !matrix.coverage"
run: |
cd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
- name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
if: matrix.coverage
run: |
cd lightning-block-sync
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
- name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
if: "matrix.build-tx-sync && !matrix.coverage"
run: |
cd lightning-transaction-sync
cargo build --verbose --color always --features esplora-blocking
cargo build --verbose --color always --features esplora-async
cargo build --verbose --color always --features esplora-async-https
- name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
if: "matrix.build-tx-sync && matrix.coverage"
- name: Install no-std-check dependencies for ARM Embedded
if: "matrix.platform == 'ubuntu-latest'"
run: |
cd lightning-transaction-sync
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
- name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
if: "matrix.build-tx-sync"
run: |
cd lightning-transaction-sync
cargo test --verbose --color always --features esplora-blocking
cargo test --verbose --color always --features esplora-async
cargo test --verbose --color always --features esplora-async-https
- name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
if: "matrix.toolchain == 'stable'"
shell: bash # Default on Winblows is powershell
run: |
cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio
if: "matrix.build-net-tokio && !matrix.coverage"
run: cargo test --verbose --color always
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
if: matrix.coverage
run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
- name: Test no-std builds on Rust ${{ matrix.toolchain }}
if: "matrix.build-no-std && !matrix.coverage"
shell: bash # Default on Winblows is powershell
run: |
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
cd $DIR
cargo test --verbose --color always --no-default-features --features no-std
# check if there is a conflict between no-std and the default std feature
cargo test --verbose --color always --features no-std
# check that things still pass without grind_signatures
# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
cargo test --verbose --color always --no-default-features --features std
# check if there is a conflict between no-std and the c_bindings cfg
RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
cd ..
done
# check no-std compatibility across dependencies
cd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
- name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
run: |
cd no-std-check
rustup target add thumbv7m-none-eabi
sudo apt-get -y install gcc-arm-none-eabi
cargo build --target=thumbv7m-none-eabi
- name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
if: "matrix.build-no-std && matrix.coverage"
- name: shellcheck the CI script
if: "matrix.platform == 'ubuntu-latest'"
run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
- name: Test futures builds on Rust ${{ matrix.toolchain }}
if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
- name: Run CI script with coverage generation
if: matrix.coverage
shell: bash # Default on Winblows is powershell
run: |
cd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
- name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
if: "matrix.build-futures && matrix.coverage"
run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
- name: Run CI script
if: "!matrix.coverage"
shell: bash # Default on Winblows is powershell
run: |
cd lightning-background-processor
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
- name: Test on Rust ${{ matrix.toolchain }}
if: "! matrix.build-net-tokio"
run: |
cargo test --verbose --color always -p lightning
cargo test --verbose --color always -p lightning-invoice
cargo test --verbose --color always -p lightning-rapid-gossip-sync
cargo test --verbose --color always -p lightning-persister
cargo test --verbose --color always -p lightning-background-processor
- name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
if: "! matrix.build-net-tokio"
run: |
RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
- name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
if: "matrix.build-net-tokio && !matrix.coverage"
run: |
cd lightning-block-sync
cargo test --verbose --color always --features rest-client
cargo test --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client,tokio
- name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
if: matrix.coverage
run: |
cd lightning-block-sync
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
- name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
if: "matrix.test-custom-message"
run: |
cd lightning-custom-message
cargo test --verbose --color always
run: ./ci/ci-tests.sh
- name: Install deps for kcov
if: matrix.coverage
run: |
Expand Down
91 changes: 91 additions & 0 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
echo -e "\n\nTest backtrace-debug builds"
pushd lightning
cargo test --verbose --color always --features backtrace
popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
pushd $DIR
cargo test --verbose --color always --no-default-features --features no-std
# check if there is a conflict between no-std and the default std feature
cargo test --verbose --color always --features no-std
# check that things still pass without grind_signatures
# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
cargo test --verbose --color always --no-default-features --features std
# check if there is a conflict between no-std and the c_bindings cfg
RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
pushd no-std-check
cargo build --target=thumbv7m-none-eabi
popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
pushd lightning-transaction-sync
cargo build --verbose --color always --features esplora-blocking
cargo test --verbose --color always --features esplora-blocking
cargo build --verbose --color always --features esplora-async
cargo test --verbose --color always --features esplora-async
cargo build --verbose --color always --features esplora-async-https
cargo test --verbose --color always --features esplora-async-https
popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
echo -e "\n\nTest Custom Message Macros"
pushd lightning-custom-message
cargo test --verbose --color always
popd
fi
4 changes: 2 additions & 2 deletions lightning/src/onion_message/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
if message_type == CUSTOM_MESSAGE_TYPE {
let mut buf = Vec::new();
buffer.read_to_end(&mut buf)?;
let buf = read_to_end(buffer)?;
assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
return Ok(Some(TestCustomMessage {}))
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Bump MSRV to 1.48 and replace most of CI with a bash script#2107

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

 Merged

TheBlueMatt
merged 6 commits into

from

Mar 17, 2023
 Merged


Bump MSRV to 1.48 and replace most of CI with a bash script
#2107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
11a0d26

Bump MSRV to 1.48


TheBlueMatt Mar 15, 2023
fb4f34c

Remove `build-net-tokio` flag in CI since its now always true


TheBlueMatt Mar 15, 2023
263173f

Remove `build-no-std` CI flag now that its always true


TheBlueMatt Mar 15, 2023
4e32de7

Remove `build-features` CI flag now that its always true


TheBlueMatt Mar 15, 2023
28cc71f

Fix onion_message functional_tests `no-std` build


TheBlueMatt Mar 15, 2023
6558b51

Replace the bulk of CI with a (much simpler) bash script


TheBlueMatt Mar 15, 2023

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


233 changes: 23 additions & 210 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,70 +7,21 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
 platform: [ ubuntu-latest ]
 toolchain: [ stable,
 beta,
 # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister
 1.41.1,
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0]
 platform: [ ubuntu-latest, windows-latest, macos-latest ]
 toolchain: [ stable, beta ]
 include:
 - toolchain: stable
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 platform: ubuntu-latest
 coverage: true
 - toolchain: stable
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 test-custom-message: true
 - toolchain: beta
 platform: macos-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: stable
 # 1.48.0 is the MSRV for all crates except lightning-transaction-sync and Win/Mac
 - toolchain: 1.48.0
 platform: ubuntu-latest
 # Windows requires 1.49.0 because that's the MSRV for supported Tokio
 - toolchain: 1.49.0
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 platform: windows-latest
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: false
 - toolchain: beta
 build-net-tokio: true
 build-no-std: true
 build-futures: true
 build-tx-sync: true
 - toolchain: beta
 test-custom-message: true
 - toolchain: 1.41.1
 build-no-std: false
 test-log-variants: true
 build-futures: false
 build-tx-sync: false
 - toolchain: 1.45.2
 build-net-old-tokio: true
 build-net-tokio: true
 build-no-std: false
 build-futures: true
 build-tx-sync: false
 - toolchain: 1.47.0
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 # MacOS-latest requires 1.54.0 because that's what's required for linking to work properly
 - toolchain: 1.54.0
 platform: macos-latest
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -81,162 +32,24 @@ jobs:
 toolchain: ${{ matrix.toolchain }}
 override: true
 profile: minimal
 - name: Pin tokio to 1.14 for Rust 1.45
 if: "matrix.build-net-old-tokio"
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Pin tokio to 1.26 for Windows
 if: "matrix.platform == 'windows-latest'"
 run: cargo update -p tokio --precise "1.26.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo build --verbose --color always -p lightning
 cargo build --verbose --color always -p lightning-invoice
 cargo build --verbose --color always -p lightning-persister
 - name: Build on Rust ${{ matrix.toolchain }} with all Log-Limiting features
 if: matrix.test-log-variants
 run: |
 cd lightning
 for FEATURE in $(cat Cargo.toml | grep '^max_level_' | awk '{ print $1 }'); do
 cargo build --verbose --color always --features $FEATURE
 done
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo build --verbose --color always --features rest-client
 cargo build --verbose --color always --features rpc-client
 cargo build --verbose --color always --features rpc-client,rest-client
 cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features rpc-client,rest-client,tokio
 - name: Build Transaction Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync && !matrix.coverage"
 run: |
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 - name: Install no-std-check dependencies for ARM Embedded
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning && RUST_BACKTRACE=1 cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-no-std && !matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 cd $DIR
 cargo test --verbose --color always --no-default-features --features no-std
 # check if there is a conflict between no-std and the default std feature
 cargo test --verbose --color always --features no-std
 # check that things still pass without grind_signatures
 # note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
 cargo test --verbose --color always --no-default-features --features std
 # check if there is a conflict between no-std and the c_bindings cfg
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
 cd ..
 done
 # check no-std compatibility across dependencies
 cd no-std-check
 cargo check --verbose --color always --features lightning-transaction-sync
 - name: Build no-std-check on Rust ${{ matrix.toolchain }} for ARM Embedded
 if: "matrix.build-no-std && matrix.platform == 'ubuntu-latest'"
 run: |
 cd no-std-check
 rustup target add thumbv7m-none-eabi
 sudo apt-get -y install gcc-arm-none-eabi
 cargo build --target=thumbv7m-none-eabi
 - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-no-std && matrix.coverage"
 - name: shellcheck the CI script
 if: "matrix.platform == 'ubuntu-latest'"
 run: |
cd lightning
RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
 - name: Test futures builds on Rust ${{ matrix.toolchain }}
 if: "matrix.build-futures && !matrix.coverage"
sudo apt-get -y install shellcheck
shellcheck ci/ci-tests.sh
 - name: Run CI script with coverage generation
 if: matrix.coverage
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 cargo test --verbose --color always --no-default-features --features futures
 - name: Test futures builds on Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
 if: "matrix.build-futures && matrix.coverage"
 run: LDK_COVERAGE_BUILD=true ./ci/ci-tests.sh
 - name: Run CI script
 if: "!matrix.coverage"
 shell: bash # Default on Winblows is powershell
 run: |
 cd lightning-background-processor
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features futures
 - name: Test on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 cargo test --verbose --color always -p lightning
 cargo test --verbose --color always -p lightning-invoice
 cargo test --verbose --color always -p lightning-rapid-gossip-sync
 cargo test --verbose --color always -p lightning-persister
 cargo test --verbose --color always -p lightning-background-processor
 - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
 if: "! matrix.build-net-tokio"
 run: |
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning-invoice
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
 RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: |
 cd lightning-block-sync
 cargo test --verbose --color always --features rest-client
 cargo test --verbose --color always --features rpc-client
 cargo test --verbose --color always --features rpc-client,rest-client
 cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: matrix.coverage
 run: |
 cd lightning-block-sync
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client
 RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --features rpc-client,rest-client,tokio
 - name: Test Custom Message Macros on Rust ${{ matrix.toolchain }}
 if: "matrix.test-custom-message"
 run: |
 cd lightning-custom-message
 cargo test --verbose --color always
 run: ./ci/ci-tests.sh
 - name: Install deps for kcov
 if: matrix.coverage
 run: |
Expand Down

91 changes: 91 additions & 0 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
#!/bin/bash
set -eox pipefail

RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"

# Tokio MSRV on versions newer than 1.14 is rustc 1.49
[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose
[ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code"

export RUST_BACKTRACE=1

echo -e "\n\nBuilding and testing all workspace crates..."
cargo build --verbose --color always
cargo test --verbose --color always

echo -e "\n\nBuilding with all Log-Limiting features"
pushd lightning
grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
	cargo build --verbose --color always --features "$FEATURE"
done
popd

if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
	echo -e "\n\nTest backtrace-debug builds"
	pushd lightning
	cargo test --verbose --color always --features backtrace
	popd
fi

echo -e "\n\nTesting no-std flags in various combinations"
for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
	pushd $DIR
	cargo test --verbose --color always --no-default-features --features no-std
	# check if there is a conflict between no-std and the default std feature
	cargo test --verbose --color always --features no-std
	# check that things still pass without grind_signatures
	# note that outbound_commitment_test only runs in this mode, because of hardcoded signature values
	cargo test --verbose --color always --no-default-features --features std
	# check if there is a conflict between no-std and the c_bindings cfg
	RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
	popd
done

echo -e "\n\nTesting no-std build on a downstream no-std crate"
# check no-std compatibility across dependencies
pushd no-std-check
cargo check --verbose --color always --features lightning-transaction-sync
popd

if [ -f "$(which arm-none-eabi-gcc)" ]; then
	pushd no-std-check
	cargo build --target=thumbv7m-none-eabi
	popd
fi

echo -e "\n\nBuilding and testing Block Sync Clients with features"
pushd lightning-block-sync
cargo build --verbose --color always --features rest-client
cargo test --verbose --color always --features rest-client
cargo build --verbose --color always --features rpc-client
cargo test --verbose --color always --features rpc-client
cargo build --verbose --color always --features rpc-client,rest-client
cargo test --verbose --color always --features rpc-client,rest-client
cargo build --verbose --color always --features rpc-client,rest-client,tokio
cargo test --verbose --color always --features rpc-client,rest-client,tokio
popd

if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
	pushd lightning-transaction-sync
	cargo build --verbose --color always --features esplora-blocking
	cargo test --verbose --color always --features esplora-blocking
	cargo build --verbose --color always --features esplora-async
	cargo test --verbose --color always --features esplora-async
	cargo build --verbose --color always --features esplora-async-https
	cargo test --verbose --color always --features esplora-async-https
	popd
fi

echo -e "\n\nTest futures builds"
pushd lightning-background-processor
cargo test --verbose --color always --no-default-features --features futures
popd

if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
	echo -e "\n\nTest Custom Message Macros"
	pushd lightning-custom-message
	cargo test --verbose --color always
	popd
fi

4 changes: 2 additions & 2 deletions
lightning/src/onion_message/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use bitcoin::network::constants::Network;
use bitcoin::secp256k1::{PublicKey, Secp256k1};

use crate::io;
use crate::io_extras::read_to_end;
use crate::sync::Arc;

struct MessengerNode {
Expand DownExpand Up@@ -59,8 +60,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
	fn handle_custom_message(&self, _msg: Self::CustomMessage) {}
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, DecodeError> where Self: Sized {
 if message_type == CUSTOM_MESSAGE_TYPE {
 let mut buf = Vec::new();
 buffer.read_to_end(&mut buf)?;
 let buf = read_to_end(buffer)?;
 assert_eq!(buf, CUSTOM_MESSAGE_CONTENTS);
 return Ok(Some(TestCustomMessage {}))
 }
Expand Down