From 63d6a9303258582e38b83c6f62fb301a583062a5 Mon Sep 17 00:00:00 2001 From: Pierre Zemb Date: Fri, 9 Jul 2021 12:08:10 +0200 Subject: [PATCH 1/4] ci: remove windows The FDB community is officially discontinuing the Windows build (see apple/foundationdb#5135 for more info). We cannot download msi packages as they were removed from official sites. As the `windows-latest` is mandatory for any PR, this commit is removing the `windows-latest` from Github actions. We may add it back later to use community build. --- .github/workflows/ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15174b58..88d97e70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] toolchain: ["1.40.0", "stable"] runs-on: ${{ matrix.os }} @@ -24,13 +24,6 @@ jobs: - name: Install FoundationDB uses: Clikengo/foundationdb-actions-install@v1 - - name: Install Clang - if: matrix.os == 'windows-latest' - run: | - curl -fsSL -o LLVM9.exe https://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe - 7z x LLVM9.exe -y -o"C:/Program Files/LLVM" - echo "LIBCLANG_PATH=C:/Program Files/LLVM/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: From 23dc27d3f8fb274e8ddbe43e7be1eb35d197d15e Mon Sep 17 00:00:00 2001 From: Pierre Zemb Date: Mon, 16 Aug 2021 06:58:36 +0200 Subject: [PATCH 2/4] fix(ci): use python2 for bindingtester --- scripts/run_bindingtester.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/run_bindingtester.sh b/scripts/run_bindingtester.sh index 04a02c01..80791855 100755 --- a/scripts/run_bindingtester.sh +++ b/scripts/run_bindingtester.sh @@ -32,7 +32,7 @@ esac ## Run the test echo "testers['rust'] = Tester('rust', '${bindingtester}', 2040, 23, MAX_API_VERSION, types=ALL_TYPES) " >> ./bindings/bindingtester/known_testers.py - ./bindings/bindingtester/bindingtester.py --test-name scripted rust - ./bindings/bindingtester/bindingtester.py --num-ops 1000 --api-version 610 --test-name api --compare python rust - ./bindings/bindingtester/bindingtester.py --num-ops 1000 --api-version 610 --test-name api --concurrency 5 rust + python2 ./bindings/bindingtester/bindingtester.py --test-name scripted rust + python2 ./bindings/bindingtester/bindingtester.py --num-ops 1000 --api-version 610 --test-name api --compare python rust + python2 ./bindings/bindingtester/bindingtester.py --num-ops 1000 --api-version 610 --test-name api --concurrency 5 rust ) From e70c076e6efd3c2f6a7055ee2737536827bf04b9 Mon Sep 17 00:00:00 2001 From: Pierre Zemb Date: Mon, 27 Sep 2021 07:47:14 +0200 Subject: [PATCH 3/4] fix(ci): target an existing structopt version --- foundationdb-bench/Cargo.toml | 2 +- foundationdb-bindingtester/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/foundationdb-bench/Cargo.toml b/foundationdb-bench/Cargo.toml index f710e48b..95827e18 100644 --- a/foundationdb-bench/Cargo.toml +++ b/foundationdb-bench/Cargo.toml @@ -26,4 +26,4 @@ futures = "0.3.0" log = "0.4.8" rand = "0.7.2" stopwatch = "0.0.7" -structopt = "0.3.3" +structopt = "0.3.12" diff --git a/foundationdb-bindingtester/Cargo.toml b/foundationdb-bindingtester/Cargo.toml index 2144faa2..acc397b8 100644 --- a/foundationdb-bindingtester/Cargo.toml +++ b/foundationdb-bindingtester/Cargo.toml @@ -36,4 +36,4 @@ foundationdb-sys = { version = "0.5.1", path = "../foundationdb-sys", default-fe futures = "0.3.0" log = "0.4.8" num-bigint = "0.3.0" -structopt = "0.3.3" +structopt = "0.3.12" From 54c76d265e18594b22a32868530a5ef18e455270 Mon Sep 17 00:00:00 2001 From: Pierre Zemb Date: Mon, 27 Sep 2021 08:45:32 +0200 Subject: [PATCH 4/4] fix: Bump minimum version to rust 1.46 * structopt * clang-sys --- .github/workflows/ci.yml | 2 +- README.md | 4 ++-- foundationdb/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88d97e70..1e9f7c40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - toolchain: ["1.40.0", "stable"] + toolchain: ["1.46.0", "stable"] runs-on: ${{ matrix.os }} diff --git a/README.md b/README.md index e7d81c1a..d88c08da 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/Clikengo/foundationdb-rs/CI)](https://github.com/Clikengo/foundationdb-rs/actions) [![Codecov](https://img.shields.io/codecov/c/github/Clikengo/foundationdb-rs)](https://codecov.io/gh/Clikengo/foundationdb-rs) -![Rustc 1.40+](https://img.shields.io/badge/rustc-1.40+-lightgrey) +![Rustc 1.46+](https://img.shields.io/badge/rustc-1.46+-lightgrey) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=Clikengo/foundationdb-rs)](https://dependabot.com) # FoundationDB Rust Client @@ -13,7 +13,7 @@ The repo consists of multiple crates | [**foundationdb-sys**](foundationdb-sys/README.md) | [![Crates.io](https://img.shields.io/crates/v/foundationdb-sys)](https://crates.io/crates/foundationdb-sys) [![foundationdb-sys](https://docs.rs/foundationdb-sys/badge.svg)](https://docs.rs/foundationdb-sys) | C API bindings for FoundationDB | | **foundationdb-gen** | n/a | Code generator for common options and types of FoundationDB | -The current version requires rustc 1.40+ to work (async/await feature). +The current version requires rustc 1.46+ to work. The previous version (0.3) is still maintained and is available within the 0.3 branch. You can access the `master` branch documentation [here](https://clikengo.github.io/foundationdb-rs/foundationdb/index.html). diff --git a/foundationdb/README.md b/foundationdb/README.md index 32334e33..68be0215 100644 --- a/foundationdb/README.md +++ b/foundationdb/README.md @@ -4,7 +4,7 @@ This is a wrapper library around the FoundationDB (Fdb) C API. It implements fut ## Prerequisites -Rust 1.40+ +Rust 1.46+ ### Install FoundationDB