From 660e3f994d1b98554017d349090db901977cbc2a Mon Sep 17 00:00:00 2001 From: Yuri Edward Date: Wed, 10 Jul 2024 22:55:03 +0200 Subject: [PATCH] Restructured repository and workflows --- .github/workflows/development.yml | 134 +------------------- Cargo.toml | 2 +- {tracing => core}/Cargo.toml | 0 {tracing => core}/src/core/engine.rs | 0 {tracing => core}/src/core/mod.rs | 0 {tracing => core}/src/field.rs | 0 {tracing => core}/src/lib.rs | 0 {tracing => core}/src/logger.rs | 0 {tracing => core}/src/macros.rs | 0 {tracing => core}/src/profiler/interface.rs | 0 {tracing => core}/src/profiler/mod.rs | 0 {tracing => core}/src/profiler/section.rs | 0 {tracing => core}/src/trace/interface.rs | 0 {tracing => core}/src/trace/mod.rs | 0 {tracing => core}/src/trace/span.rs | 0 {tracing => core}/src/util.rs | 0 16 files changed, 6 insertions(+), 130 deletions(-) rename {tracing => core}/Cargo.toml (100%) rename {tracing => core}/src/core/engine.rs (100%) rename {tracing => core}/src/core/mod.rs (100%) rename {tracing => core}/src/field.rs (100%) rename {tracing => core}/src/lib.rs (100%) rename {tracing => core}/src/logger.rs (100%) rename {tracing => core}/src/macros.rs (100%) rename {tracing => core}/src/profiler/interface.rs (100%) rename {tracing => core}/src/profiler/mod.rs (100%) rename {tracing => core}/src/profiler/section.rs (100%) rename {tracing => core}/src/trace/interface.rs (100%) rename {tracing => core}/src/trace/mod.rs (100%) rename {tracing => core}/src/trace/span.rs (100%) rename {tracing => core}/src/util.rs (100%) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 64e8000..aa9c98a 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -6,136 +6,12 @@ on: jobs: test-build: - name: Build & Test - strategy: - matrix: - os: - - ubuntu-20.04 - - macos-11 - - windows-2019 - runs-on: ${{ matrix.os }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - name: Build - run: cargo build --all-features - - name: Test - uses: bp3d-actions/cargo@main - with: - check-name: cargo test (${{ matrix.os }}) - command: test - args: --all-features --no-fail-fast - token: ${{ secrets.GITHUB_TOKEN }} + uses: bp3d-actions/workflows/.github/workflows/Build_Test.yml@main - clippy: - name: Check | Clippy - if: ${{ always() }} + analyze: + uses: bp3d-actions/workflows/.github/workflows/Analyze.yml@main needs: test-build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - with: - components: clippy - - name: Run check - uses: bp3d-actions/clippy-check@main - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-features - audit: - name: Check | Audit - if: ${{ always() }} + release: + uses: bp3d-actions/workflows/.github/workflows/Release.yml@main needs: test-build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - name: Install Audit Tool - run: cargo install cargo-audit - - name: Run check - uses: bp3d-actions/audit-check@main - with: - token: ${{ secrets.GITHUB_TOKEN }} - - fmt: - name: Format Code - if: ${{ always() && github.ref != 'refs/heads/master' }} - needs: - - clippy - - audit - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt - - name: Run code formatter - uses: bp3d-actions/rustfmt-check@main - with: - token: ${{ secrets.GITHUB_TOKEN }} - - version: - name: Get Version - needs: test-build - runs-on: ubuntu-latest - outputs: - name: ${{ steps.version.outputs.name }} - version: ${{ steps.version.outputs.version }} - isnew: ${{ steps.version.outputs.isnew }} - ispre: ${{ steps.version.outputs.ispre }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Get Version - id: version - uses: bp3d-actions/cargo-version@main - with: - mode: get - token: ${{ secrets.GITHUB_TOKEN }} - - create-pre-release: - name: Create Pre Release - needs: version - if: github.ref == 'refs/heads/develop' && needs.version.outputs.isnew == 'true' && needs.version.outputs.ispre == 'true' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - name: Setup cargo - run: cargo login ${{ secrets.RELEASE_TOKEN }} - - name: Publish - run: cargo publish - - name: Create - uses: ncipollo/release-action@main - with: - tag: ${{ needs.version.outputs.version }} - commit: ${{ github.ref }} - prerelease: true - name: ${{ needs.version.outputs.name }} release ${{ needs.version.outputs.version }} - body: "[Link to crates.io](https://crates.io/crates/${{ needs.version.outputs.name }})" - - create-release-pr: - name: Create Release Pull Request - needs: version - if: needs.version.outputs.isnew == 'true' && needs.version.outputs.ispre == 'false' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Create Pull Request - uses: repo-sync/pull-request@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - destination_branch: master - pr_title: Release ${{ needs.version.outputs.version }} diff --git a/Cargo.toml b/Cargo.toml index bd654ed..0de0b1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["tracing"] +members = ["core"] diff --git a/tracing/Cargo.toml b/core/Cargo.toml similarity index 100% rename from tracing/Cargo.toml rename to core/Cargo.toml diff --git a/tracing/src/core/engine.rs b/core/src/core/engine.rs similarity index 100% rename from tracing/src/core/engine.rs rename to core/src/core/engine.rs diff --git a/tracing/src/core/mod.rs b/core/src/core/mod.rs similarity index 100% rename from tracing/src/core/mod.rs rename to core/src/core/mod.rs diff --git a/tracing/src/field.rs b/core/src/field.rs similarity index 100% rename from tracing/src/field.rs rename to core/src/field.rs diff --git a/tracing/src/lib.rs b/core/src/lib.rs similarity index 100% rename from tracing/src/lib.rs rename to core/src/lib.rs diff --git a/tracing/src/logger.rs b/core/src/logger.rs similarity index 100% rename from tracing/src/logger.rs rename to core/src/logger.rs diff --git a/tracing/src/macros.rs b/core/src/macros.rs similarity index 100% rename from tracing/src/macros.rs rename to core/src/macros.rs diff --git a/tracing/src/profiler/interface.rs b/core/src/profiler/interface.rs similarity index 100% rename from tracing/src/profiler/interface.rs rename to core/src/profiler/interface.rs diff --git a/tracing/src/profiler/mod.rs b/core/src/profiler/mod.rs similarity index 100% rename from tracing/src/profiler/mod.rs rename to core/src/profiler/mod.rs diff --git a/tracing/src/profiler/section.rs b/core/src/profiler/section.rs similarity index 100% rename from tracing/src/profiler/section.rs rename to core/src/profiler/section.rs diff --git a/tracing/src/trace/interface.rs b/core/src/trace/interface.rs similarity index 100% rename from tracing/src/trace/interface.rs rename to core/src/trace/interface.rs diff --git a/tracing/src/trace/mod.rs b/core/src/trace/mod.rs similarity index 100% rename from tracing/src/trace/mod.rs rename to core/src/trace/mod.rs diff --git a/tracing/src/trace/span.rs b/core/src/trace/span.rs similarity index 100% rename from tracing/src/trace/span.rs rename to core/src/trace/span.rs diff --git a/tracing/src/util.rs b/core/src/util.rs similarity index 100% rename from tracing/src/util.rs rename to core/src/util.rs