Skip to content

Commit

Permalink
ci: update container image
Browse files Browse the repository at this point in the history
Update container image to NixOS release 22.05.

Also update Rust to release 1.62 and FDB 7.1.x release to 7.1.12.

Adjust `fdb-stacktester-{630,710}` to Rust 1.62 clippy lints.

In NixOS 22.05 release, for some reason `/nix/var/nix/daemon-socket`
directory is not being created. So manually create this path so that
systemd's `nix-daemon.socket` can be properly started.

Update `cargo-llvm-cov` to 0.4.9 release.
  • Loading branch information
rajivr committed Jul 14, 2022
1 parent e150892 commit 7196259
Show file tree
Hide file tree
Showing 19 changed files with 84 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request-6_3_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pull_request-6_3_24

env:
image_version: 6_3_24
image_tag: 3faa15b369a0
image_tag: a941c67da0e8

on:
pull_request:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: pull_request-7_1_3
name: pull_request-7_1_12

env:
image_version: 7_1_3
image_tag: 3205cb0f188a
image_version: 7_1_12
image_tag: c72739bee1a9

on:
pull_request:
Expand All @@ -25,11 +25,11 @@ jobs:
-
name: Run 7.1/pull_request.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#pull_request-7_1_3 --command ./7.1/pull_request.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#pull_request-7_1_12 --command ./7.1/pull_request.sh
-
name: Run 7.1/pull_request_lcov.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#pull_request-nightly-7_1_3 --command ./7.1/pull_request_lcov.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#pull_request-nightly-7_1_12 --command ./7.1/pull_request_lcov.sh
-
name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-6_3_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: push-6_3_24

env:
image_version: 6_3_24
image_tag: 3faa15b369a0
image_tag: a941c67da0e8

on:
push:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: push-7_1_3
name: push-7_1_12

env:
image_version: 7_1_3
image_tag: 3205cb0f188a
image_version: 7_1_12
image_tag: c72739bee1a9

on:
push:
Expand All @@ -25,11 +25,11 @@ jobs:
-
name: Run 7.1/push.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push-7_1_3 --command ./7.1/push.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push-7_1_12 --command ./7.1/push.sh
-
name: Run 7.1/push_lcov.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push-nightly-7_1_3 --command ./7.1/push_lcov.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push-nightly-7_1_12 --command ./7.1/push_lcov.sh
-
name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: push-rustdoc-7_1_3
name: push-rustdoc-7_1_12

env:
image_version: 7_1_3
image_tag: 3205cb0f188a
image_version: 7_1_12
image_tag: c72739bee1a9

on:
push:
Expand All @@ -25,7 +25,7 @@ jobs:
-
name: Run 7.1/push_rustdoc.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push_rustdoc-7_1_3 --command ./7.1/push_rustdoc.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#push_rustdoc-7_1_12 --command ./7.1/push_rustdoc.sh
-
name: Deploy docs
uses: peaceiris/actions-gh-pages@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-6_3_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: schedule-6_3_24

env:
image_version: 6_3_24
image_tag: 3faa15b369a0
image_tag: a941c67da0e8

# We adjust the number of iterations in `schedule.sh` so that the job
# takes approximately 1 hour to finish. Jobs are scheduled at minute
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: schedule-7_1_3
name: schedule-7_1_12

env:
image_version: 7_1_3
image_tag: 3205cb0f188a
image_version: 7_1_12
image_tag: c72739bee1a9

# We adjust the number of iterations in `schedule.sh` so that the job
# takes approximately 1 hour to finish. Jobs are scheduled at minute
Expand All @@ -28,7 +28,7 @@ jobs:
-
name: Run 7.1/schedule.sh
run: |
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#schedule-7_1_3 --command ./7.1/schedule.sh
sudo podman exec --user runner:docker --workdir /home/runner/fdb/nix/ci --tty fdb nix develop .#schedule-7_1_12 --command ./7.1/schedule.sh
-
name: Stop container
run: |
Expand Down
4 changes: 2 additions & 2 deletions fdb-stacktester/fdb-stacktester-630/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ impl StackMachine {
for ti in 0..packed_tuple.size() {
let mut res = Tuple::new();

let _ = packed_tuple
packed_tuple
.get_bigint(ti)
.map(|bi| res.add_bigint(bi))
.or_else(|_| packed_tuple.get_bool(ti).map(|b| res.add_bool(b)))
Expand Down Expand Up @@ -2328,7 +2328,7 @@ fn main() -> Result<(), Box<dyn Error>> {

// Ensure that start thread task successfully exits. This
// happens when there are no more active threads.
let _ = start_thread_task_join_handle.await?;
start_thread_task_join_handle.await?;

Result::<(), Box<dyn Error>>::Ok(())
})?;
Expand Down
6 changes: 3 additions & 3 deletions fdb-stacktester/fdb-stacktester-710/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ impl StackMachine {
for ti in 0..packed_tuple.size() {
let mut res = Tuple::new();

let _ = packed_tuple
packed_tuple
.get_bigint(ti)
.map(|bi| res.add_bigint(bi))
.or_else(|_| packed_tuple.get_bool(ti).map(|b| res.add_bool(b)))
Expand Down Expand Up @@ -2177,7 +2177,7 @@ impl StackMachine {
}
Err(err) => self.push_err(inst_number, err),
}
} else if let Err(err) = unsafe { tr.run(f).await } {
} else if let Err(err) = tr.run(f).await {
self.push_err(inst_number, err);
}
}
Expand Down Expand Up @@ -2518,7 +2518,7 @@ fn main() -> Result<(), Box<dyn Error>> {

// Ensure that start thread task successfully exits. This
// happens when there are no more active threads.
let _ = start_thread_task_join_handle.await?;
start_thread_task_join_handle.await?;

Result::<(), Box<dyn Error>>::Ok(())
})?;
Expand Down
2 changes: 1 addition & 1 deletion fdb/examples/get_mapped_range.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ fn main() -> Result<(), Box<dyn Error>> {
// Records with primary key of 0..=4 will be inserted.
insert_record_with_indexes(5, &fdb_database).await?;

let _ = fdb_database
fdb_database
.run(|tr| async move {
// Get mapped key values from 1..=3.
let mut mapped_range_stream = Range::new(index_entry_key(1), index_entry_key(4))
Expand Down
2 changes: 1 addition & 1 deletion nix/ci/7.1/pull_request.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ cd fdb-stacktester/fdb-stacktester-710 || { echo "cd failure"; exit 1; }

cargo build --bin fdb-stacktester-710 --release

pip install foundationdb==7.1.3
pip install foundationdb==7.1.12

# Run `scripted` test once. This is similar to how it is done in
# `run_tester_loop.sh`.
Expand Down
14 changes: 7 additions & 7 deletions nix/ci/7.1/pull_request_lcov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cargo llvm-cov --lib --tests --features=fdb-7_1 --lcov --output-path lcov/tests.

# Run examples

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_committed_version --features=fdb-7_1 --lcov --output-path lcov/get_committed_version.info

Expand All @@ -29,27 +29,27 @@ cargo llvm-cov run --example get_committed_version --features=fdb-7_1 --lcov --o
# #
# # [1] https://forums.foundationdb.org/t/everything-about-getmappedrange/3280/3

# /opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
# /opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

# cargo llvm-cov run --example get_mapped_range --features=fdb-7_1 --lcov --output-path lcov/get_mapped_range.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_range --features=fdb-7_1 --lcov --output-path lcov/get_range.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_versionstamp --features=fdb-7_1 --lcov --output-path lcov/get_versionstamp.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example hello_world --features=fdb-7_1 --lcov --output-path lcov/hello_world.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example open_database --features=fdb-7_1 --lcov --output-path lcov/open_database.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example watch --features=fdb-7_1 --lcov --output-path lcov/watch.info

Expand Down
2 changes: 1 addition & 1 deletion nix/ci/7.1/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ cd fdb-stacktester/fdb-stacktester-710 || { echo "cd failure"; exit 1; }

cargo build --bin fdb-stacktester-710 --release

pip install foundationdb==7.1.3
pip install foundationdb==7.1.12

# Run `scripted` test once. This is similar to how it is done in
# `run_tester_loop.sh`.
Expand Down
14 changes: 7 additions & 7 deletions nix/ci/7.1/push_lcov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cargo llvm-cov --lib --tests --features=fdb-7_1 --lcov --output-path lcov/tests.

# Run examples

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_committed_version --features=fdb-7_1 --lcov --output-path lcov/get_committed_version.info

Expand All @@ -29,27 +29,27 @@ cargo llvm-cov run --example get_committed_version --features=fdb-7_1 --lcov --o
# #
# # [1] https://forums.foundationdb.org/t/everything-about-getmappedrange/3280/3

# /opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
# /opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

# cargo llvm-cov run --example get_mapped_range --features=fdb-7_1 --lcov --output-path lcov/get_mapped_range.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_range --features=fdb-7_1 --lcov --output-path lcov/get_range.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example get_versionstamp --features=fdb-7_1 --lcov --output-path lcov/get_versionstamp.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example hello_world --features=fdb-7_1 --lcov --output-path lcov/hello_world.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example open_database --features=fdb-7_1 --lcov --output-path lcov/open_database.info

/opt/fdb/cli/7.1.3/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"
/opt/fdb/cli/7.1.12/fdbcli -C /home/runner/fdb.cluster --exec "writemode on; clearrange \x00 \xff"

cargo llvm-cov run --example watch --features=fdb-7_1 --lcov --output-path lcov/watch.info

Expand Down
2 changes: 1 addition & 1 deletion nix/ci/7.1/schedule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd ../../fdb-stacktester/fdb-stacktester-710 || { echo "cd failure"; exit 1; }

cargo build --bin fdb-stacktester-710 --release

pip install foundationdb==7.1.3
pip install foundationdb==7.1.12

# Run `scripted` test once. This is similar to how it is done in
# `run_tester_loop.sh`.
Expand Down
4 changes: 2 additions & 2 deletions nix/ci/cargo-llvm-cov/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "cargo-llvm-cov";

version = "0.3.1";
version = "0.4.9";

src = fetchurl {
url = "https://github.com/taiki-e/cargo-llvm-cov/releases/download/v${version}/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz";
sha256 = "sha256-IeAHM2le6cjGbU13Jk4OkuCDDZ7wPxmjIZh5ko7vlis=";
sha256 = "sha256-Gg24R33D1IrG0jX35FyD4sz5vJlpEyrY7Zzo9FKEW+A=";
};

unpackPhase = ":";
Expand Down
20 changes: 10 additions & 10 deletions nix/ci/fdb-7.1/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ in
[
(
let
version = "7.1.3";
sha256 = "sha256-kXCqh5vinx7EwpWKEvQ77lmy1OVODcOd23GPD/RY2jk=";
version = "7.1.12";
sha256 = "sha256-5KeYLcy22eYWuQVUMIlrAP90h0crAzvkrcl/ADZ5yCE=";
isDir = false;

fdb-client-lib = pkgs.callPackage ./client-lib { inherit version sha256 isDir; };
Expand All @@ -45,8 +45,8 @@ in

(
let
version = "7.1.3";
sha256 = "sha256-kXCqh5vinx7EwpWKEvQ77lmy1OVODcOd23GPD/RY2jk=";
version = "7.1.12";
sha256 = "sha256-5KeYLcy22eYWuQVUMIlrAP90h0crAzvkrcl/ADZ5yCE=";
isDir = true;

fdb-client-lib-dir = pkgs.callPackage ./client-lib { inherit version sha256 isDir; };
Expand All @@ -57,8 +57,8 @@ in
(
let
name = "monitor";
sha256 = "sha256-67qgMHUa0giGs8KvahvKHtgk0ZQz7QpoDtiRPMM+JD8=";
version = "7.1.3";
version = "7.1.12";
sha256 = "sha256-meuNIjt6xhkuTM1AiF8fvtFM2SnM16MutNPsHH58gz8=";

fdb-monitor = pkgs.callPackage ./app { inherit name sha256 version; };
in
Expand All @@ -68,8 +68,8 @@ in
(
let
name = "server";
sha256 = "sha256-SmlBVss1hPyr1NHIyW1ld6W6JCvVMsc6AWvYUydGUwA=";
version = "7.1.3";
version = "7.1.12";
sha256 = "sha256-FQzCcIAeFLfGszkJ61BJqYRlq2ev/fMxA93Lz6qkRJg=";

fdb-server = pkgs.callPackage ./app { inherit name sha256 version; };
in
Expand All @@ -79,8 +79,8 @@ in
(
let
name = "cli";
sha256 = "sha256-6ZZvcZlRTC6yWZW3gbncChYzxC+iRHGCgLovIGeBcvo=";
version = "7.1.3";
version = "7.1.12";
sha256 = "sha256-JGHdRcAXii+hiOamrmy6GA5LG4a4aCfbF4o1LoHC4p0=";

fdb-cli = pkgs.callPackage ./app { inherit name sha256 version; };
in
Expand Down
Loading

0 comments on commit 7196259

Please sign in to comment.