diff options
author | Robert Adam <dev@robert-adam.de> | 2022-01-01 22:28:35 +0300 |
---|---|---|
committer | Robert Adam <dev@robert-adam.de> | 2022-01-01 22:38:40 +0300 |
commit | 6caa808e67fe72b797fec42d9821e9e2242ca74b (patch) | |
tree | c5cf68303c86aeb83163bc3c712d687787346219 /.ci/azure-pipelines | |
parent | 2a31ed0f34b389d55eaa237108cf80f7eb8b9c97 (diff) |
BUILD: Remove concept of an RELEASE_ID
Having a separate RELEASE_ID just unnecessarily complicates drafting
releases. Plus, now that we are using different build numbers for every
new build anyway, a separate release ID is really not necessary.
Diffstat (limited to '.ci/azure-pipelines')
-rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 4 | ||||
-rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 4 | ||||
-rwxr-xr-x | .ci/azure-pipelines/release_macos.bash | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index e7e061d78..b0b2e6a50 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -26,12 +26,10 @@ else BUILD_NUMBER=0 fi -RELEASE_ID=$(python "scripts/mumble-version.py") - cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_INSTALL_PREFIX=appdir/usr -DCMAKE_UNITY_BUILD=ON \ - -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ + -DCMAKE_BUILD_TYPE=Release -DBUILD_NUMBER=$BUILD_NUMBER \ -Dtests=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index 7bda34054..ff1099bb1 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -37,12 +37,10 @@ else BUILD_NUMBER=0 fi -RELEASE_ID=$(python "scripts/mumble-version.py") - cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DBUILD_NUMBER=$BUILD_NUMBER \ -Dtests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY diff --git a/.ci/azure-pipelines/release_macos.bash b/.ci/azure-pipelines/release_macos.bash index 17b9c7e79..19e4ef110 100755 --- a/.ci/azure-pipelines/release_macos.bash +++ b/.ci/azure-pipelines/release_macos.bash @@ -13,10 +13,10 @@ # repository is downloaded. # -RELEASE_ID=$(python "scripts/mumble-version.py") +VERSION=$(python "scripts/mumble-version.py") cd $BUILD_BINARIESDIRECTORY -$BUILD_SOURCESDIRECTORY/macx/scripts/osxdist.py --version=$RELEASE_ID --source-dir=$BUILD_SOURCESDIRECTORY --binary-dir=. +$BUILD_SOURCESDIRECTORY/macx/scripts/osxdist.py --version=$VERSION --source-dir=$BUILD_SOURCESDIRECTORY --binary-dir=. mv *.dmg $BUILD_ARTIFACTSTAGINGDIRECTORY |