Skip to content

Commit 8821a05

Browse files
CodeBlanchCodeBlanch
committed
Make sure all components use the same package workflow.
1 parent 2147e02 commit 8821a05

38 files changed

+111
-861
lines changed

‎.github/workflows/Component.Package.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Pack Component
33
on:
44
workflow_call:
55
inputs:
6-
project-name:
6+
project:
77
required: true
88
type: string
99

@@ -23,22 +23,22 @@ jobs:
2323
- name: Setup dotnet
2424
uses: actions/setup-dotnet@v4
2525

26-
- name: dotnet restore build/Projects/${{ inputs.project-name }}.proj
27-
run: dotnet restore build/Projects/${{ inputs.project-name }}.proj -p:EnablePackageValidation=true
26+
- name: dotnet restore ${{ inputs.project }}
27+
run: dotnet restore ${{ inputs.project }} -p:EnablePackageValidation=true
2828

29-
- name: dotnet build build/Projects/${{ inputs.project-name }}.proj
30-
run: dotnet build build/Projects/${{ inputs.project-name }}.proj --configuration Release --no-restore -p:Deterministic=true -p:BuildNumber=${{ github.run_number }}
29+
- name: dotnet build ${{ inputs.project }}
30+
run: dotnet build ${{ inputs.project }} --configuration Release --no-restore -p:Deterministic=true -p:BuildNumber=${{ github.run_number }}
3131

32-
- name: dotnet test build/Projects/${{ inputs.project-name }}.proj
33-
run: dotnet test build/Projects/${{ inputs.project-name }}.proj --configuration Release --no-restore --no-build
32+
- name: dotnet test ${{ inputs.project }}
33+
run: dotnet test ${{ inputs.project }} --configuration Release --no-restore --no-build
3434

35-
- name: dotnet pack build/Projects/${{ inputs.project-name }}.proj
36-
run: dotnet pack build/Projects/${{ inputs.project-name }}.proj --configuration Release --no-restore --no-build -p:EnablePackageValidation=true
35+
- name: dotnet pack ${{ inputs.project }}
36+
run: dotnet pack ${{ inputs.project }} --configuration Release --no-restore --no-build -p:EnablePackageValidation=true
3737

3838
- name: Publish Artifacts
3939
uses: actions/upload-artifact@v4
4040
with:
41-
name: ${{ inputs.project-name }}.proj-packages
41+
name: ${{ github.ref_name }}-packages
4242
path: 'src/*/bin/Release/*.*nupkg'
4343

4444
- name: Publish NuGets

‎.github/workflows/package-Exporter.Geneva.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
call-build-test-pack:
1616
uses: ./.github/workflows/Component.Package.yml
1717
with:
18-
project-name: OpenTelemetry.Exporter.Geneva
18+
project: build/Projects/OpenTelemetry.Exporter.Geneva.proj
1919
secrets: inherit

‎.github/workflows/package-Exporter.InfluxDB.yml‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,8 @@ on:
1212
- 'Exporter.InfluxDB-*' # trigger when we create a tag with prefix "Exporter.InfluxDB-"
1313

1414
jobs:
15-
build-test-pack:
16-
runs-on: ${{ matrix.os }}
17-
permissions:
18-
contents: write
19-
env:
20-
PROJECT: OpenTelemetry.Exporter.InfluxDB
21-
22-
strategy:
23-
matrix:
24-
os: [windows-latest]
25-
26-
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
fetch-depth: 0 # fetching all
30-
31-
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v4
33-
34-
- name: Install dependencies
35-
run: dotnet restore src/${{env.PROJECT}}
36-
37-
- name: dotnet build ${{env.PROJECT}}
38-
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
39-
40-
- name: dotnet test ${{env.PROJECT}}
41-
run: dotnet test test/${{env.PROJECT}}.Tests
42-
43-
- name: dotnet pack ${{env.PROJECT}}
44-
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build
45-
46-
- name: Publish Artifacts
47-
uses: actions/upload-artifact@v4
48-
with:
49-
name: ${{env.PROJECT}}-packages
50-
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg'
51-
52-
- name: Publish Nuget
53-
run: |
54-
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
55-
56-
- name: Create GitHub Prerelease
57-
if: ${{ (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
58-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --prerelease
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
62-
- name: Create GitHub Release
63-
if: ${{ !(contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
64-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --latest
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
call-build-test-pack:
16+
uses: ./.github/workflows/Component.Package.yml
17+
with:
18+
project: src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj
19+
secrets: inherit

‎.github/workflows/package-Exporter.Instana.yml‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,8 @@ on:
1212
- 'Exporter.Instana-*' # trigger when we create a tag with prefix "Exporter.Instana-"
1313

1414
jobs:
15-
build-test-pack:
16-
runs-on: ${{ matrix.os }}
17-
permissions:
18-
contents: write
19-
env:
20-
PROJECT: OpenTelemetry.Exporter.Instana
21-
22-
strategy:
23-
matrix:
24-
os: [windows-latest]
25-
26-
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
fetch-depth: 0 # fetching all
30-
31-
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v4
33-
34-
- name: Install dependencies
35-
run: dotnet restore src/${{env.PROJECT}}
36-
37-
- name: dotnet build ${{env.PROJECT}}
38-
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
39-
40-
- name: dotnet test ${{env.PROJECT}}
41-
run: dotnet test test/${{env.PROJECT}}.Tests
42-
43-
- name: dotnet pack ${{env.PROJECT}}
44-
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build
45-
46-
- name: Publish Artifacts
47-
uses: actions/upload-artifact@v4
48-
with:
49-
name: ${{env.PROJECT}}-packages
50-
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg'
51-
52-
- name: Publish Nuget
53-
run: |
54-
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
55-
56-
- name: Create GitHub Prerelease
57-
if: ${{ (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
58-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --prerelease
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
62-
- name: Create GitHub Release
63-
if: ${{ !(contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
64-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --latest
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
call-build-test-pack:
16+
uses: ./.github/workflows/Component.Package.yml
17+
with:
18+
project: src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj
19+
secrets: inherit

‎.github/workflows/package-Exporter.OneCollector.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
call-build-test-pack:
1616
uses: ./.github/workflows/Component.Package.yml
1717
with:
18-
project-name: OpenTelemetry.Exporter.OneCollector
18+
project: build/Projects/OpenTelemetry.Exporter.OneCollector.proj
1919
secrets: inherit

‎.github/workflows/package-Exporter.Stackdriver.yml‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,8 @@ on:
1212
- 'Exporter.Stackdriver-*' # trigger when we create a tag with prefix "Exporter.Stackdriver-"
1313

1414
jobs:
15-
build-test-pack:
16-
runs-on: ${{ matrix.os }}
17-
permissions:
18-
contents: write
19-
env:
20-
PROJECT: OpenTelemetry.Exporter.Stackdriver
21-
22-
strategy:
23-
matrix:
24-
os: [windows-latest]
25-
26-
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
fetch-depth: 0 # fetching all
30-
31-
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v4
33-
34-
- name: Install dependencies
35-
run: dotnet restore src/${{env.PROJECT}}
36-
37-
- name: dotnet build ${{env.PROJECT}}
38-
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
39-
40-
- name: dotnet test ${{env.PROJECT}}
41-
run: dotnet test test/${{env.PROJECT}}.Tests
42-
43-
- name: dotnet pack ${{env.PROJECT}}
44-
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build
45-
46-
- name: Publish Artifacts
47-
uses: actions/upload-artifact@v4
48-
with:
49-
name: ${{env.PROJECT}}-packages
50-
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg'
51-
52-
- name: Publish Nuget
53-
run: |
54-
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
55-
56-
- name: Create GitHub Prerelease
57-
if: ${{ (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
58-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --prerelease
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
62-
- name: Create GitHub Release
63-
if: ${{ !(contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
64-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --latest
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
call-build-test-pack:
16+
uses: ./.github/workflows/Component.Package.yml
17+
with:
18+
project: src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj
19+
secrets: inherit

‎.github/workflows/package-Extensions.AWS.yml‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,8 @@ on:
1212
- 'Extensions.AWS-*' # trigger when we create a tag with prefix "Extensions.AWS-"
1313

1414
jobs:
15-
build-test-pack:
16-
runs-on: ${{ matrix.os }}
17-
permissions:
18-
contents: write
19-
env:
20-
PROJECT: OpenTelemetry.Extensions.AWS
21-
22-
strategy:
23-
matrix:
24-
os: [windows-latest]
25-
26-
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
fetch-depth: 0 # fetching all
30-
31-
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v4
33-
34-
- name: Install dependencies
35-
run: dotnet restore src/${{env.PROJECT}}
36-
37-
- name: dotnet build ${{env.PROJECT}}
38-
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
39-
40-
- name: dotnet test ${{env.PROJECT}}
41-
run: dotnet test test/${{env.PROJECT}}.Tests
42-
43-
- name: dotnet pack ${{env.PROJECT}}
44-
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build
45-
46-
- name: Publish Artifacts
47-
uses: actions/upload-artifact@v4
48-
with:
49-
name: ${{env.PROJECT}}-packages
50-
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg'
51-
52-
- name: Publish Nuget
53-
run: |
54-
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
55-
56-
- name: Create GitHub Prerelease
57-
if: ${{ (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
58-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --prerelease
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
62-
- name: Create GitHub Release
63-
if: ${{ !(contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
64-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --latest
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
call-build-test-pack:
16+
uses: ./.github/workflows/Component.Package.yml
17+
with:
18+
project: src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj
19+
secrets: inherit

‎.github/workflows/package-Extensions.Enrichment.yml‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,8 @@ on:
1212
- 'Extensions.Enrichment-*' # trigger when we create a tag with prefix "Extensions.Enrichment-"
1313

1414
jobs:
15-
build-test-pack:
16-
runs-on: ${{ matrix.os }}
17-
permissions:
18-
contents: write
19-
env:
20-
PROJECT: OpenTelemetry.Extensions.Enrichment
21-
22-
strategy:
23-
matrix:
24-
os: [windows-latest]
25-
26-
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
fetch-depth: 0 # fetching all
30-
31-
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v4
33-
34-
- name: Install dependencies
35-
run: dotnet restore src/${{env.PROJECT}}
36-
37-
- name: dotnet build ${{env.PROJECT}}
38-
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
39-
40-
- name: dotnet test ${{env.PROJECT}}
41-
run: dotnet test test/${{env.PROJECT}}.Tests
42-
43-
- name: dotnet pack ${{env.PROJECT}}
44-
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build
45-
46-
- name: Publish Artifacts
47-
uses: actions/upload-artifact@v4
48-
with:
49-
name: ${{env.PROJECT}}-packages
50-
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg'
51-
52-
- name: Publish Nuget
53-
run: |
54-
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
55-
56-
- name: Create GitHub Prerelease
57-
if: ${{ (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
58-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --prerelease
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
62-
- name: Create GitHub Release
63-
if: ${{ !(contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.') || contains(github.ref_name, '-rc.')) }}
64-
run: gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --verify-tag --notes "See [CHANGELOG](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/${{ github.ref_name }}/src/${{env.PROJECT}}/CHANGELOG.md) for details." --latest
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
call-build-test-pack:
16+
uses: ./.github/workflows/Component.Package.yml
17+
with:
18+
project: src/OpenTelemetry.Extensions.Enrichment/OpenTelemetry.Extensions.Enrichment.csproj
19+
secrets: inherit

‎.github/workflows/package-Extensions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
call-build-test-pack:
1616
uses: ./.github/workflows/Component.Package.yml
1717
with:
18-
project-name: OpenTelemetry.Extensions
18+
project: build/Projects/OpenTelemetry.Extensions.proj
1919
secrets: inherit

0 commit comments

Comments
 (0)