diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 00f75d0..18e0d15 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -97,7 +97,6 @@ jobs: uses: actions/download-artifact@v1 with: name: Build - path: ./build.zip - name: Download Version Info uses: actions/download-artifact@v1 with: @@ -107,12 +106,25 @@ jobs: - name: Set Version Number shell: powershell run: | - Get-ChildItem "./Version" - $version = Get-Content -Path ./Version/version.txt - Write-Host "Version: $version" - Write-Output "::set-env name=VERSION::$version" - Remove-Item -Path ./Version/version.txt - Remove-Item -Path ./Version + Get-ChildItem "./Version" + $version = Get-Content -Path ./Version/version.txt + Write-Host "Version: $version" + Write-Output "::set-env name=VERSION::$version" + Remove-Item -Path ./Version/version.txt + Remove-Item -Path ./Version + - name: Copy build output and push + run: | + $branch = $(${{ env.GITHUB_REF }}) -Replace "refs/heads/"; + git checkout -b $branch + Get-ChildItem -Path "./Build" | Copy-Item -Path ./ + Remove-Item -Path ./Build -Recurse + git add . + git commit -m "Build ${{ env.GITHUB_RUN_NUMBER }} from commit: https://github.com/${{ env.GITHUB_REPOSITORY }}/commit/${{ env.GITHUB_SHA }}" + git tag ${{ env.VERSION }} + git push --set-upstream origin +$branch --force + git push --tags origin + + # "Build #${SOURCE_BUILD_NUMBER} from commit: https://github.com/PepperDash/PepperDashCore/commit/${COMMIT}" - name: Check Directory run: | Get-ChildItem "./" @@ -127,23 +139,23 @@ jobs: # path: ./internal_builds_repo # repository: PepperDash-Engineering/pepperdash-core-builds # - name: Download Build output - # uses: actions/download-artifact@v1 - # with: - # name: Build - # path: ./build.zip - # - name: Download Version Info - # uses: actions/download-artifact@v1 - # with: - # name: Version - # - name: Check Directory - # run: Get-ChildItem "./" - # - name: Set Version Number - # shell: powershell - # run: | - # Get-ChildItem "./" - # $version = Get-Content -Path ./version.txt - # Write-Output "::set-env name=VERSION::$version" - # Remove-Item -Path ./version.txt - # - name: Check Directory - # run: | - # Get-ChildItem "./" + # uses: actions/download-artifact@v1 + # with: + # name: Build + # path: ./build.zip + # - name: Download Version Info + # uses: actions/download-artifact@v1 + # with: + # name: Version + # - name: Check Directory + # run: Get-ChildItem "./" + # - name: Set Version Number + # shell: powershell + # run: | + # Get-ChildItem "./" + # $version = Get-Content -Path ./version.txt + # Write-Output "::set-env name=VERSION::$version" + # Remove-Item -Path ./version.txt + # - name: Check Directory + # run: | + # Get-ChildItem "./"