diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88dbca5aea438f2ae7df22de5b7daa7c25f896f4..e49eb16c32aed593cee5733b0562390b22efb9b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,6 +136,26 @@ build_deb: paths: - target/debian/duniter*.deb +build_rpm: + stage: deploy + extends: .env + rules: + - if: $CI_COMMIT_REF_NAME =~ /^wip*$/ + when: manual + - if: $CI_COMMIT_TAG + when: never + - <<: *is_network_branch + when: never + - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"' + - when: manual + script: + - cargo install cargo-generate-rpm + - cargo -Zgit=shallow-deps --release + - cargo generate-rpm -p node + artifacts: + paths: + - target/generate-rpm/duniter*.rpm + tests: stage: tests extends: .env diff --git a/node/Cargo.toml b/node/Cargo.toml index 651e364202946ee4758aec57ff92e2e53e812d5c..1271c3d2bc16129f19e505828d60ba93e66896c2 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -215,8 +215,9 @@ assets = [ [package.metadata.generate-rpm] assets = [ - { source = "../target/release/duniter", dest = "/usr/bin/duniter", mode = "755" }, + { source = "../target/release/duniter", dest = "/usr/bin/duniter2", mode = "755" }, { source = "../resources/debian/env_file", dest = "/etc/duniter/env_file", config = true, mode = "0640" }, - { source = "../resources/debian/duniter-mirror.service", dest = "/etc/systemd/system/duniter-mirror.service", config = true, mode = "0644" }, - { source = "../resources/debian/duniter-smith.service", dest = "/etc/systemd/system/duniter-smith.service", config = true, mode = "0644" }, + { source = "../resources/debian/duniter-mirror.service", dest = "/usr/lib/systemd/system/duniter-mirror.service", mode = "0644" }, + { source = "../resources/debian/duniter-smith.service", dest = "/usr/lib/systemd/system/duniter-smith.service", mode = "0644" }, + { source = "../resources/debian/duniter-smith.service", dest = "/usr/lib/systemd/system/distance-oracle.service", mode = "0644" }, ]