Skip to content

Commit 7bf93c5

Browse files
authored
feat!: use QCS core-deps; update OTEL version (#35)
1 parent 11d08c4 commit 7bf93c5

56 files changed

Lines changed: 611 additions & 740 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/checks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Run Rust CI
2222
run: cargo make check-all
2323

24-
# Setup Python and run Python example
2524
- name: Setup python
2625
uses: actions/setup-python@v5
2726
with:

.github/workflows/publish.yml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,14 @@ on:
44
release:
55
types: [published]
66
workflow_dispatch:
7-
# "Manually publish release"
8-
inputs:
9-
opentelemetry:
10-
description: "Publish pyo3-opentelemetry"
11-
type: boolean
12-
default: false
13-
opentelemetry_macros:
14-
description: "Publish pyo3-opentelemetry-macros"
15-
type: boolean
16-
default: false
17-
tracing_subscriber:
18-
description: "Publish pyo3-tracing-subscriber"
19-
type: boolean
20-
default: false
217

228
jobs:
23-
opentelemetry:
9+
cargo-publish:
2410
runs-on: ubuntu-latest
2511
if: |
26-
${{ (github.event_name == 'release' && startsWith(github.event.release.tag_name, 'opentelemetry/v'))
27-
|| (github.event_name == 'workflow_dispatch' && inputs.opentelemetry) }}
12+
${{ (github.event_name == 'release')
13+
|| (github.event_name == 'workflow_dispatch') }}
2814
steps:
2915
- uses: actions/checkout@v5
3016
- uses: Swatinem/rust-cache@v2
31-
# Below we give some time to make sure that the macros crate is published before the lib crate
32-
# in the case that the new lib crate depends on the new, yet to be published macros crate.
33-
- run: timeout 15m bash -c 'until ./scripts/ci/assert-macros-crate-published.sh; do sleep 10; done'
34-
- run: cargo publish -p pyo3-opentelemetry --locked --token ${{ secrets.CRATES_IO_TOKEN }}
35-
36-
opentelemetry-macros:
37-
runs-on: ubuntu-latest
38-
if: |
39-
${{ (github.event_name == 'release' && startsWith(github.event.release.tag_name, 'opentelemetry-macros/v'))
40-
|| (github.event_name == 'workflow_dispatch' && inputs.opentelemetry_macros) }}
41-
steps:
42-
- uses: actions/checkout@v5
43-
- uses: Swatinem/rust-cache@v2
44-
- run: cargo publish -p pyo3-opentelemetry-macros --locked --token ${{ secrets.CRATES_IO_TOKEN }}
45-
46-
tracing-subscriber:
47-
runs-on: ubuntu-latest
48-
if: |
49-
${{ (github.event_name == 'release' && startsWith(github.event.release.tag_name, 'tracing-subscriber/v'))
50-
|| (github.event_name == 'workflow_dispatch' && inputs.tracing_subscriber) }}
51-
steps:
52-
- uses: actions/checkout@v5
53-
- uses: Swatinem/rust-cache@v2
54-
- run: cargo publish -p pyo3-tracing-subscriber --locked --token ${{ secrets.CRATES_IO_TOKEN }}
55-
17+
- run: cargo publish --workspace --locked --token ${{ secrets.CRATES_IO_TOKEN }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
git config --global user.email "${{ github.triggering_actor}}@users.noreply.github.com"
3333
3434
- name: Install Knope
35-
uses: knope-dev/action@v2.1.0
35+
uses: knope-dev/action@v2.1.2
3636
with:
37-
version: 0.21.3
37+
version: 0.23.0
3838

3939
- name: Dry-run Release
4040
run: knope release --verbose --dry-run

0 commit comments

Comments
 (0)