diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f31c42529..6237ff86f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,12 +11,12 @@ variables: # - if VERSION was already set (when manually running a pipeline), use it # - if we are in the official Dynare repository: # + if on a tag: use the tag -# + if on master: use 6-unstable-$TIMESTAMP-$COMMIT +# + if on master: use 7-unstable-$TIMESTAMP-$COMMIT # + on another branch: use $BRANCH-$TIMESTAMP-$COMMIT # - if in a personal repository: use $USER-$TIMESTAMP-$COMMIT before_script: - 'if [[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ -n $CI_COMMIT_TAG ]]; then export VERSION=$CI_COMMIT_TAG; fi' - - 'if [[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]]; then export VERSION=6-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA; fi' + - 'if [[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]]; then export VERSION=7-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA; fi' - 'if [[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]]; then export VERSION=$CI_COMMIT_REF_NAME-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA; fi' - 'if [[ -z $VERSION ]]; then export VERSION=$CI_PROJECT_NAMESPACE-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA; fi' diff --git a/meson.build b/meson.build index 4eeb541bd..5e6cce3ae 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('dynare', 'cpp', 'fortran', 'c', - version : '6-unstable', + version : '7-unstable', # NB: update C++ standard in .clang-format whenever the following is modified default_options : [ 'cpp_std=gnu++20', 'fortran_std=f2018', 'c_std=gnu17', 'warning_level=2' ], diff --git a/preprocessor b/preprocessor index 5fa91a08f..e32025a76 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 5fa91a08f68d04a8baac4f32dab9db62b5a3546f +Subproject commit e32025a76fb156a9af8101f9f43faf7eaa2f72ef