diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7a6135c..70f3444 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -59,11 +59,20 @@ jobs: - name: Zip Build Output shell: powershell run: ./.github/scripts/ZipBuildOutput.ps1 + # Write the version to a file to be consumed by the push jobs + - name: Write Version + run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt" - name: Upload Build Output uses: actions/upload-artifact@v1 with: name: Build path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip + # Upload the Version file as an artifact + - name: Upload version.txt + uses: actions/upload-artifact@v1 + with: + name: Version + path: ${{env.GITHUB_HOME}}\output\version.txt # Upload the build package to the release - name: Upload Release Package id: upload_release @@ -105,7 +114,7 @@ jobs: Remove-Item -Path ./Version # Checkout/Create the branch - name: Create new branch - run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/") + run: git checkout master # Download the build output into the repo - name: Download Build output uses: actions/download-artifact@v1 @@ -141,10 +150,7 @@ jobs: # Push the commit - name: Push to Builds Repo shell: powershell - run: | - $branch = $($Env:GITHUB_REF) -replace "refs/heads/" - Write-Host "Branch: $branch" - git push -u origin $($branch) --force + run: git push -u origin master --force # Push the tags - name: Push tags run: git push --tags origin @@ -154,7 +160,6 @@ jobs: Public_Push_Output: needs: Build_Project runs-on: windows-latest - if: contains(github.ref, 'master') || contains(github.ref, 'release') steps: # Checkout the repo - name: Checkout Builds Repo @@ -182,7 +187,7 @@ jobs: Remove-Item -Path ./Version # Checkout/Create the branch - name: Create new branch - run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/") + run: git checkout master # Download the build output into the repo - name: Download Build output uses: actions/download-artifact@v1 @@ -218,10 +223,7 @@ jobs: # Push the commit - name: Push to Builds Repo shell: powershell - run: | - $branch = $($Env:GITHUB_REF) -replace "refs/heads/" - Write-Host "Branch: $branch" - git push -u origin $($branch) --force + run: git push -u origin master --force # Push the tags - name: Push tags run: git push --tags origin