Ready for v1.02 release

statisticalbiotechnology · May 5, 2022 · 0b85642 · 0b85642
1 parent f873482
commit 0b85642
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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-<major>-<minor>[-<patch>], 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-<major>-<minor>[-<patch>], e.g. rel-3-01 or rel-3-01-2
 7. create a branch on github with the version number