diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index f8c9757..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Publish - -on: - push: - tags: [ "**" ] - -env: - RUST_LOG: debug - CARGO_TERM_COLOR: always - RUST_BACKTRACE: "1" - RUSTFLAGS: "-D warnings" - CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - -jobs: - publish: - name: Publish - - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Rust Stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - - name: Cargo publish - uses: actions-rs/cargo@v1 - with: - command: publish diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml new file mode 100644 index 0000000..7702a73 --- /dev/null +++ b/.github/workflows/release-plz.yml @@ -0,0 +1,60 @@ +name: Release-plz + +permissions: + pull-requests: write + contents: write + +on: + push: + branches: + - master + +jobs: + + # Release unpublished packages. + release-plz-release: + name: Release-plz release + runs-on: ubuntu-latest + if: ${{ github.repository_owner == 'jmjoy' }} + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@stable + - name: Run release-plz + uses: release-plz/action@v0.5 + with: + command: release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + + # Create a PR with the new versions and changelog, preparing the next release. + release-plz-pr: + name: Release-plz PR + runs-on: ubuntu-latest + if: ${{ github.repository_owner == 'jmjoy' }} + permissions: + contents: write + pull-requests: write + concurrency: + group: release-plz-${{ github.ref }} + cancel-in-progress: false + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@stable + - name: Run release-plz + uses: release-plz/action@v0.5 + with: + command: release-pr + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1fdd701..1ef8f27 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,7 +33,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Docker compose - run: docker-compose up -d + run: docker compose up -d - name: Build run: cargo build --release --verbose ${{ matrix.features }} - name: Test diff --git a/src/conf/mod.rs b/src/conf/mod.rs index 0206ee6..7c34700 100644 --- a/src/conf/mod.rs +++ b/src/conf/mod.rs @@ -112,6 +112,7 @@ use reqwest::{Client, ClientBuilder}; use std::collections::HashMap; use url::Url; +#[derive(Clone)] enum ServerUrl { ConfigServer(Url), /// Todo implement fetch config via meta server. @@ -176,6 +177,7 @@ impl ApolloConfClientBuilder { } /// Apollo configuration apis client. +#[derive(Clone)] pub struct ApolloConfClient { server_url: ServerUrl, client: Client, diff --git a/tests/common.rs b/tests/common.rs index d5eeccd..b94b84e 100644 --- a/tests/common.rs +++ b/tests/common.rs @@ -25,23 +25,23 @@ pub fn setup() { #[allow(dead_code)] fn setup_docker() { - let mut down = Command::new("docker-compose"); - let output = down.arg("down").output().unwrap(); + let mut down = Command::new("docker"); + let output = down.arg("compose").arg("down").output().unwrap(); let down_stdout = String::from_utf8(output.stdout); let down_stderr = String::from_utf8(output.stderr); log::info!( - "docker-compose down, stdout: {:?}, stderr: {:?}", + "docker compose down, stdout: {:?}, stderr: {:?}", down_stdout, down_stderr ); assert!(output.status.success()); - let mut up = Command::new("docker-compose"); - let output = up.arg("up").arg("-d").output().unwrap(); + let mut up = Command::new("docker"); + let output = up.arg("compose").arg("up").arg("-d").output().unwrap(); let up_stdout = String::from_utf8(output.stdout); let up_stderr = String::from_utf8(output.stderr); log::info!( - "docker-compose up -d, stdout: {:?}, stderr: {:?}", + "docker compose up -d, stdout: {:?}, stderr: {:?}", up_stdout, up_stderr ); @@ -83,7 +83,7 @@ fn setup_docker() { }); if !b { - panic!("docker-compose up failed"); + panic!("docker compose up failed"); } }