diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96f02efca..ce8759d89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,16 +13,17 @@ jobs: - name: Install & Build run: | sudo apt update - sudo apt install -yy curl build-essential musl musl-tools python libseccomp-dev + sudo apt install -yy curl build-essential python libseccomp-dev curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - rustup target add x86_64-unknown-linux-musl source $HOME/.cargo/env cargo install cargo-deb - cargo build --bin task-maker --release --target x86_64-unknown-linux-musl - cargo deb --no-build --target x86_64-unknown-linux-musl + + export TM_DATA_DIR=/usr/share/task-maker-rust + cargo build --bin task-maker --release + cargo deb --no-build - name: Upload the artifacts uses: skx/github-action-publish-binaries@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - args: "target/x86_64-unknown-linux-musl/debian/*.deb" + args: "target/debian/*.deb" diff --git a/Cargo.lock b/Cargo.lock index cfc539100..81df38bf8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1356,34 +1356,34 @@ dependencies = [ [[package]] name = "task-maker-cache" -version = "0.1.0" +version = "0.2.1" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-dag 0.1.0", - "task-maker-store 0.1.0", + "task-maker-dag 0.2.1", + "task-maker-store 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "task-maker-dag" -version = "0.1.0" +version = "0.2.1" dependencies = [ "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "boxfnonce 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-store 0.1.0", + "task-maker-store 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "task-maker-exec" -version = "0.1.0" +version = "0.2.1" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1399,9 +1399,9 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "tabox 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-cache 0.1.0", - "task-maker-dag 0.1.0", - "task-maker-store 0.1.0", + "task-maker-cache 0.2.1", + "task-maker-dag 0.2.1", + "task-maker-store 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1409,7 +1409,7 @@ dependencies = [ [[package]] name = "task-maker-format" -version = "0.1.0" +version = "0.2.1" dependencies = [ "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "askama 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1427,9 +1427,9 @@ dependencies = [ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", "spectral 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-dag 0.1.0", - "task-maker-exec 0.1.0", - "task-maker-lang 0.1.0", + "task-maker-dag 0.2.1", + "task-maker-exec 0.2.1", + "task-maker-lang 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "task-maker-lang" -version = "0.1.0" +version = "0.2.1" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1446,14 +1446,14 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "spectral 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "tabox 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-dag 0.1.0", - "task-maker-exec 0.1.0", + "task-maker-dag 0.2.1", + "task-maker-exec 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "task-maker-rust" -version = "0.2.0" +version = "0.2.1" dependencies = [ "better-panic 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1465,18 +1465,18 @@ dependencies = [ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "tabox 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-cache 0.1.0", - "task-maker-dag 0.1.0", - "task-maker-exec 0.1.0", - "task-maker-format 0.1.0", - "task-maker-store 0.1.0", + "task-maker-cache 0.2.1", + "task-maker-dag 0.2.1", + "task-maker-exec 0.2.1", + "task-maker-format 0.2.1", + "task-maker-store 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "whoami 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "task-maker-store" -version = "0.1.0" +version = "0.2.1" dependencies = [ "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1501,9 +1501,9 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-dag 0.1.0", - "task-maker-format 0.1.0", - "task-maker-rust 0.2.0", + "task-maker-dag 0.2.1", + "task-maker-format 0.2.1", + "task-maker-rust 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index 6494c3f9a..5c85c5e9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["task-maker-*"] [package] name = "task-maker-rust" -version = "0.2.0" +version = "0.2.1" description = "Tool for building tasks for informatics competitions, with support for cache, distributed computations and more" readme = "README.md" authors = ["Edoardo Morassutto "] @@ -13,6 +13,13 @@ documentation = "https://edomora97.github.io/task-maker-rust/" repository = "https://github.com/edomora97/task-maker-rust" license = "MPL-2.0" +[package.metadata.deb] +extended-description = "Tool for building tasks for informatics competitions, with support for cache, distributed computations and more" +assets = [ + ["target/release/task-maker", "usr/bin/task-maker-rust", "755"], + ["data/**/*", "usr/share/task-maker-rust/", "755"] +] + [badges] travis-ci = { repository = "edomora97/task-maker-rust" } diff --git a/task-maker-cache/Cargo.toml b/task-maker-cache/Cargo.toml index 797a9250e..8a8b40735 100644 --- a/task-maker-cache/Cargo.toml +++ b/task-maker-cache/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-cache" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-dag/Cargo.toml b/task-maker-dag/Cargo.toml index 6846a8f5a..a81701c21 100644 --- a/task-maker-dag/Cargo.toml +++ b/task-maker-dag/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-dag" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-exec/Cargo.toml b/task-maker-exec/Cargo.toml index 5f2e3179b..7f6b11938 100644 --- a/task-maker-exec/Cargo.toml +++ b/task-maker-exec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-exec" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-format/Cargo.toml b/task-maker-format/Cargo.toml index 47f9052e0..4d5a17431 100644 --- a/task-maker-format/Cargo.toml +++ b/task-maker-format/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-format" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-lang/Cargo.toml b/task-maker-lang/Cargo.toml index db74c5f92..d02176526 100644 --- a/task-maker-lang/Cargo.toml +++ b/task-maker-lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-lang" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-store/Cargo.toml b/task-maker-store/Cargo.toml index 260ac2eaa..b4a9136c9 100644 --- a/task-maker-store/Cargo.toml +++ b/task-maker-store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "task-maker-store" -version = "0.1.0" +version = "0.2.1" authors = ["Edoardo Morassutto "] edition = "2018" diff --git a/task-maker-test/task-maker-test-sandbox/Cargo.lock b/task-maker-test/task-maker-test-sandbox/Cargo.lock index a8a773ecc..e10989dec 100644 --- a/task-maker-test/task-maker-test-sandbox/Cargo.lock +++ b/task-maker-test/task-maker-test-sandbox/Cargo.lock @@ -671,31 +671,31 @@ dependencies = [ [[package]] name = "task-maker-cache" -version = "0.1.0" +version = "0.2.1" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-dag 0.1.0", - "task-maker-store 0.1.0", + "task-maker-dag 0.2.1", + "task-maker-store 0.2.1", ] [[package]] name = "task-maker-dag" -version = "0.1.0" +version = "0.2.1" dependencies = [ "boxfnonce 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-store 0.1.0", + "task-maker-store 0.2.1", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "task-maker-exec" -version = "0.1.0" +version = "0.2.1" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -709,9 +709,9 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "tabox 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-cache 0.1.0", - "task-maker-dag 0.1.0", - "task-maker-store 0.1.0", + "task-maker-cache 0.2.1", + "task-maker-dag 0.2.1", + "task-maker-store 0.2.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "task-maker-store" -version = "0.1.0" +version = "0.2.1" dependencies = [ "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -740,7 +740,7 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "tabox 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "task-maker-exec 0.1.0", + "task-maker-exec 0.2.1", ] [[package]]