Merge pull request #97 from PepperDash/release/v1.4.33

fixes branch naming & creation
This commit is contained in:
Neil Dorin
2020-04-09 12:58:58 -06:00
committed by GitHub

View File

@@ -111,8 +111,8 @@ jobs:
Remove-Item -Path ./Version/version.txt Remove-Item -Path ./Version/version.txt
Remove-Item -Path ./Version Remove-Item -Path ./Version
# Checkout/Create the branch # Checkout/Create the branch
- name: Create new branch - name: Checkout Master branch
run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/") run: git checkout -b master
# Download the build output into the repo # Download the build output into the repo
- name: Download Build output - name: Download Build output
uses: actions/download-artifact@v1 uses: actions/download-artifact@v1
@@ -148,10 +148,7 @@ jobs:
# Push the commit # Push the commit
- name: Push to Builds Repo - name: Push to Builds Repo
shell: powershell shell: powershell
run: | run: git push -u origin master --force
$branch = $($Env:GITHUB_REF) -replace "refs/heads/"
Write-Host "Branch: $branch"
git push -u origin $($branch) --force
# Push the tags # Push the tags
- name: Push tags - name: Push tags
run: git push --tags origin run: git push --tags origin
@@ -161,7 +158,6 @@ jobs:
Public_Push_Output: Public_Push_Output:
needs: Build_Project needs: Build_Project
runs-on: windows-latest runs-on: windows-latest
if: contains(github.ref, 'master') || contains(github.ref, 'release')
steps: steps:
# Checkout the repo # Checkout the repo
- name: Checkout Builds Repo - name: Checkout Builds Repo
@@ -189,7 +185,7 @@ jobs:
Remove-Item -Path ./Version Remove-Item -Path ./Version
# Checkout/Create the branch # Checkout/Create the branch
- name: Create new branch - name: Create new branch
run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/") run: git checkout -b master
# Download the build output into the repo # Download the build output into the repo
- name: Download Build output - name: Download Build output
uses: actions/download-artifact@v1 uses: actions/download-artifact@v1
@@ -225,10 +221,7 @@ jobs:
# Push the commit # Push the commit
- name: Push to Builds Repo - name: Push to Builds Repo
shell: powershell shell: powershell
run: | run: git push -u origin master --force
$branch = $($Env:GITHUB_REF) -replace "refs/heads/"
Write-Host "Branch: $branch"
git push -u origin $($branch) --force
# Push the tags # Push the tags
- name: Push tags - name: Push tags
run: git push --tags origin run: git push --tags origin