Bump version number
parent
48c965397a
commit
1144de4167
|
@ -10,12 +10,12 @@ variables:
|
||||||
# - if VERSION was already set (when manually running a pipeline), use it
|
# - if VERSION was already set (when manually running a pipeline), use it
|
||||||
# - if we are in the official Dynare repository:
|
# - if we are in the official Dynare repository:
|
||||||
# + if on a tag: use the tag
|
# + if on a tag: use the tag
|
||||||
# + if on master: use 4.8-unstable-$TIMESTAMP-$COMMIT
|
# + if on master: use 6-unstable-$TIMESTAMP-$COMMIT
|
||||||
# + on another branch: use $BRANCH-$TIMESTAMP-$COMMIT
|
# + on another branch: use $BRANCH-$TIMESTAMP-$COMMIT
|
||||||
# - if in a personal repository: use $USER-$TIMESTAMP-$COMMIT
|
# - if in a personal repository: use $USER-$TIMESTAMP-$COMMIT
|
||||||
before_script:
|
before_script:
|
||||||
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ -n $CI_COMMIT_TAG ]] && export VERSION=$CI_COMMIT_TAG'
|
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ -n $CI_COMMIT_TAG ]] && export VERSION=$CI_COMMIT_TAG'
|
||||||
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]] && export VERSION=4.8-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]] && export VERSION=6-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
||||||
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && export VERSION=$CI_COMMIT_REF_NAME-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
- '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && export VERSION=$CI_COMMIT_REF_NAME-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
||||||
- '[[ -z $VERSION ]] && export VERSION=$CI_PROJECT_NAMESPACE-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
- '[[ -z $VERSION ]] && export VERSION=$CI_PROJECT_NAMESPACE-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
|
||||||
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
AC_PREREQ([2.62])
|
AC_PREREQ([2.62])
|
||||||
AC_INIT([dynare], [4.8-unstable])
|
AC_INIT([dynare], [6-unstable])
|
||||||
AC_CONFIG_SRCDIR([preprocessor/src/DynareMain.cc])
|
AC_CONFIG_SRCDIR([preprocessor/src/DynareMain.cc])
|
||||||
AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign no-dist-gzip dist-xz tar-pax])
|
AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign no-dist-gzip dist-xz tar-pax])
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
|
||||||
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
AC_PREREQ([2.62])
|
AC_PREREQ([2.62])
|
||||||
AC_INIT([dynare], [4.8-unstable])
|
AC_INIT([dynare], [6-unstable])
|
||||||
AC_CONFIG_SRCDIR([configure.ac])
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
|
AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
|
||||||
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
dnl along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
AC_PREREQ([2.62])
|
AC_PREREQ([2.62])
|
||||||
AC_INIT([dynare], [4.8-unstable])
|
AC_INIT([dynare], [6-unstable])
|
||||||
AC_CONFIG_SRCDIR([configure.ac])
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
|
AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit c0ea8d72038cd6c57e48aca26d2d29866848ae0a
|
Subproject commit be316b3dec67baea8f1a5f584ba6326f7816eede
|
Loading…
Reference in New Issue