From 0b85642131a03104d0ec120aac3071b6812ea9d0 Mon Sep 17 00:00:00 2001 From: Matthew The Date: Thu, 5 May 2022 12:57:58 +0200 Subject: [PATCH] Ready for v1.02 release --- .github/workflows/build_and_release.yml | 6 ++---- CommonCMake.txt | 4 ++-- admin/release_checklist.txt | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml index 7dc12b1..427c896 100644 --- a/.github/workflows/build_and_release.yml +++ b/.github/workflows/build_and_release.yml @@ -2,9 +2,7 @@ name: Build and release on: push: - branches: [ fix/github-actions-linux ] pull_request: - branches: [ master ] jobs: build-ubuntu: @@ -116,13 +114,13 @@ jobs: release: runs-on: ubuntu-latest needs: [build-ubuntu, build-centos, build-fedora, build-tarball, build-osx, build-win64] - # if: startsWith(github.ref, 'refs/tags/rel-') + if: startsWith(github.ref, 'refs/tags/rel-') steps: - name: Download artifacts uses: actions/download-artifact@v3 - run : | ls -R - mkdir releases + mkdir packages tar -czvf packages/ubuntu.tar.gz -C ubuntu-packages $(ls ubuntu-packages) tar -czvf packages/centos.tar.gz -C centos-packages $(ls centos-packages) tar -czvf packages/fedora.tar.gz -C fedora-packages $(ls fedora-packages) diff --git a/CommonCMake.txt b/CommonCMake.txt index 47904f4..703e589 100644 --- a/CommonCMake.txt +++ b/CommonCMake.txt @@ -49,8 +49,8 @@ set(CMAKE_MODULE_PATH ${MARACLUSTER_SOURCE_DIR}/cmake) # VERSION AND NAMESPACES set(CPACK_PACKAGE_VERSION_MAJOR "1") -set(CPACK_PACKAGE_VERSION_MINOR "01") -set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_PACKAGE_VERSION_MINOR "02") +set(CPACK_PACKAGE_VERSION_PATCH "0") # UPDATE PATCH VERSION FOR INTERMEDIATE BUILDS INCLUDE(VersionGen) diff --git a/admin/release_checklist.txt b/admin/release_checklist.txt index 50ed61b..1678ffe 100644 --- a/admin/release_checklist.txt +++ b/admin/release_checklist.txt @@ -1,7 +1,7 @@ 1. change version number in CommonCMake.txt -2. create binaries for all platforms with vagrant and fix building bugs -3. verify that all system tests pass -4. add information to changelog on master -5. commit and push to master on github -6. create a release on github and upload binaries, use the tag naming convention rel--[-], e.g. rel-3-01 or rel-3-01-02 +2. verify that all system tests pass +3. add information to changelog on master +4. commit and push to master on github +5. check that all GitHub action builds pass +6. create a release on github and upload binaries, use the tag naming convention rel--[-], e.g. rel-3-01 or rel-3-01-2 7. create a branch on github with the version number