diff --git a/.github/scripts/GenerateVersionNumber.ps1 b/.github/scripts/GenerateVersionNumber.ps1 index 4a4482c..529aa22 100644 --- a/.github/scripts/GenerateVersionNumber.ps1 +++ b/.github/scripts/GenerateVersionNumber.ps1 @@ -1,4 +1,4 @@ -$latestVersions = $(git describe --tags $(git tag --merged master)) +$latestVersions = $(git tag --merged master) $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 6d06a70..ef66bad 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,12 +27,12 @@ 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: 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 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: |