Commit 6899949e authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'release300' into 'master' 

Bump release version to v3.0.0

Closes #249

See merge request allpix-squared/allpix-squared!992
parents 1f1b857d b31c2400

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -558,10 +558,8 @@ deploy:documentation: 
    stage: deployment

    only:

        - tags@allpix-squared/allpix-squared

        - master  # FIXME: remove when finally deployed

    trigger:

        project: allpix-squared/allpix-squared-website

        branch: test  # FIXME: remove when finally deployed

        strategy: depend



deploy:eos:

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ IF(COMMAND CMAKE_POLICY) 
ENDIF(COMMAND CMAKE_POLICY)



# Set default version

SET(ALLPIX_VERSION "v2.0.0")

SET(ALLPIX_VERSION "v3.0.0")



# Set default build type

IF(NOT CMAKE_BUILD_TYPE)