From e603f4af8f805b7b8079551760cda38c57914004 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 6 Feb 2023 17:44:24 -0700 Subject: [PATCH] ci: fix paths after folder restructure --- .github/workflows/docker.yml | 4 ++-- .github/workflows/main.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cb05fbe..9f10395 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,10 +56,10 @@ jobs: - name: Setup MS Build uses: microsoft/setup-msbuild@v1.1 - name: restore Nuget Packages - run: nuget restore ./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE) + run: nuget restore .\$($Env:SOLUTION_FILE).sln # Build the solutions in the docker image - name: Build Solution - run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" + run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" - name: Create tag for non-rc builds if: contains(steps.setVersion.outputs.version, 'alpha') run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6afe209..f5cee5a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,9 +33,9 @@ jobs: - name: Setup MS-Build uses: microsoft/setup-msbuild@v1 - name: restore Nuget Packages - run: nuget restore .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE) + run: nuget restore .\$($Env:SOLUTION_FILE).sln - name: Build Solution - run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Release" /p:Version="${{ steps.setVersion.outputs.version }}" + run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Release" /p:Version="${{ steps.setVersion.outputs.version }}" - name: Update Existing Release id: create_release uses: ncipollo/release-action@v1 @@ -61,5 +61,5 @@ jobs: run: | nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} nuget setApiKey ${{ secrets.NUGET_API_KEY }} - nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source github - nuget push ".\package\PepperDashCore.${{ steps.setVersion.outputs.version }}.nupkg" -Source https://api.nuget.org/v3/index.json + nuget push ".\package\PepperDashCore.${{ github.event.release.tag_name }}.nupkg" -Source github + nuget push ".\package\PepperDashCore.${{ github.event.release.tag_name }}.nupkg" -Source https://api.nuget.org/v3/index.json