diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index c36bca6..1d3154f 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -28,7 +28,7 @@ jobs: - name: Rust Cache # cache the rust build artefacts uses: Swatinem/rust-cache@v2 - name: Download and install Trunk binary - run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.20.1/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- + run: wget -qO- https://github.com/trunk-rs/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: Build # build # Environment $public_url resolves to the github project page. # If using a user/organization page, remove the `${{ github.event.repository.name }}` part. @@ -36,7 +36,7 @@ jobs: # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as eframe_template/favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. - run: ./trunk build --release --public-url $public_url crates/opensi-editor/index.html + run: ./trunk build --release --public-url $public_url --config crates/opensi-editor/Trunk.toml env: public_url: "https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}" - name: Deploy diff --git a/Cargo.toml b/Cargo.toml index 3392e02..42a8aa3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ authors = ["barsoosayque ", "snpefk "] edition = "2021" license = "MIT" version = "0.1.0" +rust-version = "1.76" [profile.release] opt-level = 2 # fast and small wasm diff --git a/README.md b/README.md index b1d7621..c90788e 100644 --- a/README.md +++ b/README.md @@ -17,5 +17,5 @@ OpenSI Editor совместим с пакетами формата `*.siq` из $ cargo run opensi-editor # Запуск веб-версии (потребуется установка trunk) -$ trunk serve crates/opensi-editor/index.html +$ trunk serve --config crates/opensi-editor/Cargo.toml ``` diff --git a/crates/opensi-core/Cargo.toml b/crates/opensi-core/Cargo.toml index 834d7f1..bb95370 100644 --- a/crates/opensi-core/Cargo.toml +++ b/crates/opensi-core/Cargo.toml @@ -4,6 +4,7 @@ authors.workspace = true edition.workspace = true license.workspace = true version.workspace = true +rust-version.workspace = true [dependencies] serde = { version = "1.0", features = [ "derive" ] } diff --git a/crates/opensi-editor/Cargo.toml b/crates/opensi-editor/Cargo.toml index 62943ac..210f7fd 100644 --- a/crates/opensi-editor/Cargo.toml +++ b/crates/opensi-editor/Cargo.toml @@ -4,6 +4,7 @@ authors.workspace = true edition.workspace = true license.workspace = true version.workspace = true +rust-version.workspace = true [dependencies] opensi-core = { version = "*", path = "../opensi-core" }