Skip to content

Commit 5dd3d34

Browse files
author
Dmytro Ett
committed
I think I fixed it
1 parent d369e0e commit 5dd3d34

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Test
2727
run: dotnet test --no-build --no-restore -c Release --verbosity normal --logger trx --results-directory TestResults
2828
- name: E2E Tests
29-
run: pwsh test/e2e/run-e2e-tests.ps1 -ResultsDirectory TestResults/E2E -Logger trx
29+
run: pwsh test/e2e/run-e2e-tests.ps1 -ResultsDirectory TestResults/E2E -Logger trx -PackageOutputDirectory artifacts/e2e
3030
- name: Upload Test Results
3131
uses: actions/upload-artifact@v4
3232
if: ${{ always() }}

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
- name: Test
4848
run: dotnet test --no-build --no-restore -c Release --verbosity normal --logger trx --results-directory TestResults
4949
- name: E2E Tests
50-
run: pwsh test/e2e/run-e2e-tests.ps1 -ResultsDirectory TestResults/E2E -Logger trx
50+
run: pwsh test/e2e/run-e2e-tests.ps1 -ResultsDirectory TestResults/E2E -Logger trx -PackageOutputDirectory artifacts/e2e
5151
- name: Pack
5252
run: >
53-
dotnet pack src/AttributedDI/AttributedDI.csproj --no-build --no-restore -c Release -o artifacts
53+
dotnet pack src/AttributedDI/AttributedDI.csproj --no-build --no-restore -c Release -o artifacts/release
5454
-p:PackageVersion="${{ steps.release.outputs.version }}"
5555
-p:PackageReleaseNotes="https://github.com/dmytroett/AttributedDI/blob/main/CHANGELOG.md"
5656
-p:ContinuousIntegrationBuild=true
@@ -64,19 +64,19 @@ jobs:
6464
uses: actions/upload-artifact@v4
6565
with:
6666
name: packages
67-
path: artifacts/*.nupkg
67+
path: artifacts/release/*.nupkg
6868
- name: Upload Symbol Packages
6969
uses: actions/upload-artifact@v4
7070
with:
7171
name: symbols
72-
path: artifacts/*.snupkg
72+
path: artifacts/release/*.snupkg
7373
# - name: Create GitHub Release
7474
# uses: softprops/action-gh-release@v2
7575
# with:
7676
# body_path: artifacts/release-notes.md
7777
# files: |
78-
# artifacts/*.nupkg
79-
# artifacts/*.snupkg
78+
# artifacts/release/*.nupkg
79+
# artifacts/release/*.snupkg
8080
- name: NuGet Login (Trusted Publishing)
8181
if: ${{ env.NUGET_USER != '' }}
8282
id: nuget_login
@@ -85,7 +85,7 @@ jobs:
8585
user: ${{ env.NUGET_USER }}
8686
# - name: Publish to NuGet
8787
# if: ${{ env.NUGET_USER != '' }}
88-
# run: dotnet nuget push "artifacts/*.nupkg" --api-key "${{ steps.nuget_login.outputs.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
88+
# run: dotnet nuget push "artifacts/release/*.nupkg" --api-key "${{ steps.nuget_login.outputs.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
8989
# - name: Publish symbols to NuGet
9090
# if: ${{ env.NUGET_USER != '' }}
91-
# run: dotnet nuget push "artifacts/*.snupkg" --api-key "${{ steps.nuget_login.outputs.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
91+
# run: dotnet nuget push "artifacts/release/*.snupkg" --api-key "${{ steps.nuget_login.outputs.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate

test/e2e/run-e2e-tests.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
param(
33
[string]$ResultsDirectory,
44
[string]$Logger = "trx",
5-
[switch]$NoRestoreProps
5+
[switch]$NoRestoreProps,
6+
[string]$PackageOutputDirectory = "artifacts/e2e"
67
)
78

89
Set-StrictMode -Version Latest
910
$ErrorActionPreference = "Stop"
1011

1112
$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
1213
$repoRoot = Resolve-Path (Join-Path $scriptDir "..\..") | Select-Object -ExpandProperty Path
13-
$artifactsDir = Join-Path $repoRoot "artifacts"
14+
$artifactsDir = Join-Path $repoRoot $PackageOutputDirectory
1415
$timestamp = Get-Date -Format "yyyyMMddHHmmss"
1516
$packageVersion = "99.0.0-e2e.$timestamp"
1617

0 commit comments

Comments
 (0)