diff --git a/.github/scripts/GenerateVersionNumber.ps1 b/.github/scripts/GenerateVersionNumber.ps1 index 51e7daf..4386546 100644 --- a/.github/scripts/GenerateVersionNumber.ps1 +++ b/.github/scripts/GenerateVersionNumber.ps1 @@ -1,4 +1,4 @@ -$latestVersions = git tag --merged origin/master +$latestVersions = git tag --merged $latestVersion = [version]"0.0.0" Foreach ($version in $latestVersions) { Write-Host $version diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dec6f17..ef66bad 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,20 +27,17 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Check for tags - run: Write-Output $(git tag --merged) - # - name: Set Build to Release if triggered from Master # run: | # if("$($Env:GITHUB_REF)".contains("$($Env:RELEASE_BRANCH)")) { # Write-Host "Setting build type to Release" # Write-Output "::set-env name=BUILD_TYPE::Release" # } - # - name: Set Version Number - # shell: powershell - # run: | - # $version = ./.github/scripts/GenerateVersionNumber.ps1 - # Write-Output "::set-env name=VERSION::$version" + - name: Set Version Number + shell: powershell + run: | + $version = ./.github/scripts/GenerateVersionNumber.ps1 + Write-Output "::set-env name=VERSION::$version" # - name: Update AssemblyInfo.cs # shell: powershell # run: |