From e311c0542dc330d304a1545750b1306a4cef1ec0 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 12 Dec 2024 11:04:33 +0100 Subject: [PATCH] Move repo to `Projects`, some pipeline updates --- .gitea/workflows/build-and-test.yml | 65 ++++++++++++----------------- Cargo.toml | 5 +-- README.md | 5 +-- 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/.gitea/workflows/build-and-test.yml b/.gitea/workflows/build-and-test.yml index b6f9441..a38c5c0 100644 --- a/.gitea/workflows/build-and-test.yml +++ b/.gitea/workflows/build-and-test.yml @@ -9,13 +9,10 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Install latest nightly toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@stable - name: Cache dependencies uses: Swatinem/rust-cache@v2 @@ -26,13 +23,11 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Install latest nightly toolchain - uses: actions-rs/toolchain@v1 + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly - override: true components: rustfmt, clippy - name: Cache dependencies @@ -47,22 +42,19 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cargo-bins/cargo-binstall@main + - uses: actions/checkout@v4 + + - name: Install cargo binstall + uses: cargo-bins/cargo-binstall@main - name: Install mpv run: apt-get update && apt-get install -y mpv - - name: Install latest nightly toolchain - uses: actions-rs/toolchain@v1 + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly - override: true components: llvm-tools-preview - - name: Cache dependencies - uses: Swatinem/rust-cache@v2 - - name: Install nextest run: cargo binstall -y cargo-nextest --secure @@ -96,25 +88,22 @@ jobs: target/coverage/ - name: Upload test report - uses: https://git.pvv.ntnu.no/Projects/rsync-action@main + uses: https://git.pvv.ntnu.no/Projects/rsync-action@v1 with: source: target/coverage/html/ - target: mpvipc-async/${{ gitea.ref_name }}/coverage/ - username: oysteikt - ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }} - host: microbel.pvv.ntnu.no - known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM=" + target: ${{ gitea.ref_name }}/coverage/ + username: gitea-web + ssh-key: ${{ secrets.WEB_SYNC_SSH_KEY }} + host: bekkalokk.pvv.ntnu.no + known-hosts: "bekkalokk.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI6VSaDrMG8+flg4/AeHlAFIen8RUzWh6URQKqFegSx" docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Install latest nightly toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@stable - name: Cache dependencies uses: Swatinem/rust-cache@v2 @@ -123,11 +112,11 @@ jobs: run: cargo doc --all-features --document-private-items --release - name: Transfer files - uses: https://git.pvv.ntnu.no/Projects/rsync-action@main + uses: https://git.pvv.ntnu.no/Projects/rsync-action@v1 with: source: target/doc/ - target: mpvipc-async/${{ gitea.ref_name }}/docs/ - username: oysteikt - ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }} - host: microbel.pvv.ntnu.no - known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM=" + target: ${{ gitea.ref_name }}/docs/ + username: gitea-web + ssh-key: ${{ secrets.WEB_SYNC_SSH_KEY }} + host: bekkalokk.pvv.ntnu.no + known-hosts: "bekkalokk.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI6VSaDrMG8+flg4/AeHlAFIen8RUzWh6URQKqFegSx" diff --git a/Cargo.toml b/Cargo.toml index d82a2e6..238e945 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,8 @@ authors = [ ] description = "A small library which provides bindings to control existing mpv instances through sockets." license = "GPL-3.0" -homepage = "https://git.pvv.ntnu.no/oysteikt/mpvipc-async" -repository = "https://git.pvv.ntnu.no/oysteikt/mpvipc-async" -documentation = "https://pvv.ntnu.no/~oysteikt/gitea/mpvipc-async/master/docs/mpvipc-async/" +repository = "https://git.pvv.ntnu.no/Projects/mpvipc-async" +documentation = "https://pages.pvv.ntnu.no/Projects/mpvipc-async/master/docs/mpvipc-async/" edition = "2021" rust-version = "1.75" diff --git a/README.md b/README.md index 4beaebe..529b59c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ -[![Coverage](https://pvv.ntnu.no/~oysteikt/gitea/mpvipc-async/main/coverage/badges/for_the_badge.svg)](https://pvv.ntnu.no/~oysteikt/gitea/mpvipc-async/main/coverage/src/) -[![Docs](https://img.shields.io/badge/docs-blue?style=for-the-badge&logo=rust)](https://pvv.ntnu.no/~oysteikt/gitea/mpvipc-async/main/docs/mpvipc_async/) +[![Coverage](https://pages.pvv.ntnu.no/Projects/mpvipc-async/master/coverage/badges/for_the_badge.svg)](https://pages.pvv.ntnu.no/Projects/mpvipc-async/master/coverage/src/) +[![Docs](https://img.shields.io/badge/docs-blue?style=for-the-badge&logo=rust)](https://pages.pvv.ntnu.no/Projects/mpvipc-async/master/docs/mpvipc-async/) # mpvipc-async > **NOTE:** This is a fork of [gitlab.com/mpv-ipc/mpvipc](https://gitlab.com/mpv-ipc/mpvipc), which introduces a lot of changes to be able to use the library asynchronously with [tokio](https://github.com/tokio-rs/tokio). ---- A small library which provides bindings to control existing mpv instances through sockets.