From 63060ab7d0a82d0a292e076a595e56da666c0207 Mon Sep 17 00:00:00 2001 From: Patrick Hallisey Date: Tue, 30 Jul 2024 15:28:13 -0700 Subject: [PATCH] Use consistent variable across workflows --- .github/workflows/live-test.yml | 4 ++-- .github/workflows/main.yml | 5 +++-- .github/workflows/release.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml index db7837720..f5fc50874 100644 --- a/.github/workflows/live-test.yml +++ b/.github/workflows/live-test.yml @@ -14,7 +14,7 @@ jobs: if: github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'live test') environment: Live Testing env: - version_suffix_args: ${{ format('--version-suffix="alpha.{0}"', github.run_number) }} + version_suffix_args: ${{ format('/p:VersionSuffix="alpha.{0}"', github.run_number) }} steps: - name: Setup .NET uses: actions/setup-dotnet@v3 @@ -30,7 +30,7 @@ jobs: --filter="TestCategory!=Smoke&TestCategory!=Images&TestCategory!=Moderations&TestCategory!=Manual" --logger "trx;LogFilePrefix=live" --results-directory ${{github.workspace}}/artifacts/test-results - ${{ env.version_suffix_args }} + ${{ env.version_suffix_args}} env: OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b7d22414c..e49430148 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: name: Build runs-on: ubuntu-latest env: - version_suffix_args: ${{ format('--version-suffix="alpha.{0}"', github.run_number) }} + version_suffix_args: ${{ format('/p:VersionSuffix="alpha.{0}"', github.run_number) }} steps: - name: Setup .NET uses: actions/setup-dotnet@v3 @@ -29,7 +29,7 @@ jobs: run: dotnet pack --configuration Release --output "${{github.workspace}}/artifacts/packages" - ${{ env.version_suffix_args }} + ${{ env.version_suffix_args}} - name: Run unit tests run: dotnet test @@ -37,6 +37,7 @@ jobs: --filter="TestCategory=Smoke&TestCategory!=Manual" --logger "trx;LogFilePrefix=smoke" --results-directory ${{github.workspace}}/artifacts/test-results + ${{ env.version_suffix_args}} - name: Upload artifact uses: actions/upload-artifact@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e68bbd690..9a027595f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest environment: Live Testing env: - version_suffix_args: ${{ github.event_name == 'schedule' && format('--version-suffix="alpha.{0}"', github.run_number) || '' }} + version_suffix_args: ${{ github.event_name == 'schedule' && format('/p:VersionSuffix="alpha.{0}"', github.run_number) || '' }} permissions: packages: write contents: write