diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff1bc6e..fe40770 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,8 @@ jobs: run: sudo apt-get install musl-tools - name: Build run: cargo make build_standalone + - name: Rename + run: mv /home/runner/work/pslink/pslink/target/x86_64-unknown-linux-musl/release/pslink pslink_linux_64bit - name: Upload the artifacts uses: skx/github-action-publish-binaries@master env: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index edeb5b1..4720a3a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,7 +27,7 @@ jobs: with: version: 'latest' - uses: actions/checkout@v2 - - name: Install xmllint + - name: Install musl-tools run: sudo apt-get install musl-tools - name: Build run: cargo make build_standalone \ No newline at end of file diff --git a/README.md b/README.md index 1aa27e4..2a53ad1 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,11 @@ The Page comes with a basic commandline interface to setup the environment. The pslink binary can be downloaded from the latest release at: https://github.com/enaut/pslink/releases -These binaries are selfcontained and should run on any linux 64bit system. Just put them where you like them to be and make them executable. A sample install might be: +These binaries are selfcontained and should run on any linux 64bit sy"stem. Just put them where you like them to be and make them executable. A sample install might be: ```bash # mkdir -p /opt/pslink -# wget -o /opt/pslink/pslink https://github.com/enaut/pslink/releases/latest/download/pslink.linux.64bit +# wget -o /opt/pslink/pslink https://github.com/enaut/pslink/releases/latest/download/pslink_linux_64bit # chmod +x /opt/pslink/pslink ``` @@ -67,10 +67,7 @@ You could now adjust your `PATH` or setup an alias or just call the binary with ### Install with cargo -Pslink can be compiled and installed with cargo. Setup cargo as guided here: https://doc.rust-lang.org/cargo/getting-started/installation.html - -After that install pslink using: - +`cargo install pslink` does not (yet) produce a working binary! Use the "install binary" or "build from source" approach ### Build from source diff --git a/app/Cargo.toml b/app/Cargo.toml index e31c7c3..ecc54d2 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"] license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/enaut/pslink/" -version = "0.4.1-beta.2" +version = "0.4.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -26,8 +26,8 @@ enum-map = "1" qrcode = "0.12" image = "0.23" -pslink-shared = { version="0.4.1-alpha.0", path = "../shared" } -pslink-locales = { version="0.4.1-alpha.0", path = "../locales" } +pslink-shared = { version="0.4", path = "../shared" } +pslink-locales = { version="0.4", path = "../locales" } [dependencies.web-sys] version = "0.3" diff --git a/locales/Cargo.toml b/locales/Cargo.toml index ddad334..b791971 100644 --- a/locales/Cargo.toml +++ b/locales/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"] license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/enaut/pslink/" -version = "0.4.1-beta.2" +version = "0.4.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -18,4 +18,4 @@ fluent = "0.15" serde = {version="1.0", features = ["derive"]} unic-langid = "0.9" -pslink-shared = { version="0.4.1-alpha.0", path = "../shared" } \ No newline at end of file +pslink-shared = { version="0.4", path = "../shared" } diff --git a/pslink/Cargo.toml b/pslink/Cargo.toml index 6199629..d27a0a8 100644 --- a/pslink/Cargo.toml +++ b/pslink/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" name = "pslink" readme = "README.md" repository = "https://github.com/enaut/pslink/" -version = "0.4.1-beta.2" +version = "0.4.1" [build-dependencies] actix-web-static-files = "3.0" @@ -37,7 +37,7 @@ tracing-opentelemetry = "0.12" async-trait = "0.1" enum-map = {version="1", features = ["serde"]} -pslink-shared = {version="0.4.1-alpha.0", path = "../shared" } +pslink-shared = {version="0.4", path = "../shared" } [dependencies.chrono] features = ["serde"] diff --git a/pslink/README.md b/pslink/README.md index 13303dd..20435d9 100644 --- a/pslink/README.md +++ b/pslink/README.md @@ -1,5 +1,7 @@ # The pslink library and binary +DO NOT USE CARGO INSTALL TO INSTALL PSLINK AS THIS WILL NOT CREATE A WORKING BINARY INSTEAD DOWNLOAD THE BINARY FROM GITHUB OR COMPILE IT YOURSELF WITH CARGO MAKE! + This is the pslink server part. It provides a webserver to be run behind another webserver like apache or nginx. Everything needed to run is bundled in the pslink binary. So you can compile everything locally and the copy the single binary to your server and run it. Library features: