From bf1f5690a1177f13e040d3e71db9a7894ba15f86 Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Sun, 24 Sep 2023 11:24:45 -0300 Subject: [PATCH 1/2] ci: include bridge in binaries zip, build it by adding -all flag --- .circleci/continue-config.yml | 6 +++--- .../config-continuation/jobs/build-libqaul-linux.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml index a21789448..6a26bb843 100644 --- a/.circleci/continue-config.yml +++ b/.circleci/continue-config.yml @@ -465,20 +465,20 @@ jobs: - run: command: | sudo apt update - sudo apt install -y protobuf-compiler libdbus-1-dev pkg-config + sudo apt install -y protobuf-compiler libdbus-1-dev pkg-config cmake libssl-dev build-essential protoc --version name: Install protoc - setup-sccache - restore-sccache-cache - run: - command: cd rust && cargo build --release + command: cd rust && cargo build --release --all name: Build Libqaul for Linux - save-sccache-cache - run: command: | cd rust/target/release mkdir cli-binaries - mv qauld qaul-cli cli-binaries + mv qauld qaul-cli cli-binaries qaul-matrix-bridge cd cli-binaries zip linux-cli-binaries * name: zip command-line binaries diff --git a/circleci_config/config-continuation/jobs/build-libqaul-linux.yml b/circleci_config/config-continuation/jobs/build-libqaul-linux.yml index bf9974423..110c233e2 100644 --- a/circleci_config/config-continuation/jobs/build-libqaul-linux.yml +++ b/circleci_config/config-continuation/jobs/build-libqaul-linux.yml @@ -5,20 +5,20 @@ steps: name: Install protoc command: | sudo apt update - sudo apt install -y protobuf-compiler libdbus-1-dev pkg-config + sudo apt install -y protobuf-compiler libdbus-1-dev pkg-config cmake libssl-dev build-essential protoc --version - setup-sccache - restore-sccache-cache - run: name: Build Libqaul for Linux - command: cd rust && cargo build --release + command: cd rust && cargo build --release --all - save-sccache-cache - run: name: zip command-line binaries command: | cd rust/target/release mkdir cli-binaries - mv qauld qaul-cli cli-binaries + mv qauld qaul-cli cli-binaries qaul-matrix-bridge cd cli-binaries zip linux-cli-binaries * - persist_to_workspace: From 57803c71c298e0214e3e38b8829451c8eb6438b0 Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Sun, 24 Sep 2023 11:40:25 -0300 Subject: [PATCH 2/2] ci: include bridge in binaries zip - fixed --- .circleci/continue-config.yml | 2 +- .../config-continuation/jobs/build-libqaul-linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml index 6a26bb843..d96dd1a84 100644 --- a/.circleci/continue-config.yml +++ b/.circleci/continue-config.yml @@ -478,7 +478,7 @@ jobs: command: | cd rust/target/release mkdir cli-binaries - mv qauld qaul-cli cli-binaries qaul-matrix-bridge + mv qauld qaul-cli qaul-matrix-bridge cli-binaries cd cli-binaries zip linux-cli-binaries * name: zip command-line binaries diff --git a/circleci_config/config-continuation/jobs/build-libqaul-linux.yml b/circleci_config/config-continuation/jobs/build-libqaul-linux.yml index 110c233e2..be48df44f 100644 --- a/circleci_config/config-continuation/jobs/build-libqaul-linux.yml +++ b/circleci_config/config-continuation/jobs/build-libqaul-linux.yml @@ -18,7 +18,7 @@ steps: command: | cd rust/target/release mkdir cli-binaries - mv qauld qaul-cli cli-binaries qaul-matrix-bridge + mv qauld qaul-cli qaul-matrix-bridge cli-binaries cd cli-binaries zip linux-cli-binaries * - persist_to_workspace: