diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65806de01fcb71354b840b0e85d3ec33cba5542b..7b502354cc062ef2709f03fb6cc72de568b12fa4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,15 +8,15 @@ variables:
# The next stanza creates the version number used for the source tarball and the
# binary packages. Here are the following possible cases:
# - if VERSION was already set (when manually running a pipeline), use it
-# - if we are in the official Enterprise repository:
+# - if we are in the official Dynare repository:
# + if on a tag: use the tag
-# + if on master: use enterprise-unstable-$TIMESTAMP-$COMMIT
+# + if on master: use 4.7-unstable-$TIMESTAMP-$COMMIT
# + on another branch: use $BRANCH-$TIMESTAMP-$COMMIT
# - if in a personal repository: use $USER-$TIMESTAMP-$COMMIT
before_script:
- - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Enterprise ]] && [[ -n $CI_COMMIT_TAG ]] && export VERSION=$CI_COMMIT_TAG'
- - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Enterprise ]] && [[ $CI_COMMIT_REF_NAME == enterprise ]] && export VERSION=enterprise-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
- - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Enterprise ]] && export VERSION=$CI_COMMIT_REF_NAME-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
+ - '[[ -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.7-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 ]] && export VERSION=$CI_PROJECT_NAMESPACE-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
stages:
@@ -197,31 +197,25 @@ test_dynare++:
# those jobs to start before the “test” and “pkg” stages have succeeded. Hence
# we stick to the “dependencies” keyword.
-deploy_snapshot_enterprise:
+deploy_manual_unstable:
stage: deploy
rules:
- - if: '$CI_PROJECT_NAMESPACE == "Enterprise" && $CI_COMMIT_REF_NAME == "enterprise"'
+ - if: '$CI_PROJECT_NAMESPACE == "Dynare" && $CI_COMMIT_REF_NAME == "master"'
when: on_success
- when: never
tags:
- restricted
dependencies:
- - pkg_source
- - pkg_windows
- - pkg_macOS
+ - build_doc
script:
- - f=(windows/exe/*) && osslsigncode sign -pkcs12 ~/cepremap-comodo-sectigo-code-signing.p12 -n Dynare -i https://www.dynare.org -t http://timestamp.comodoca.com -in ${f[0]} -out ${f[0]}.signed && mv ${f[0]}.signed ${f[0]}
- - cp *.tar.xz /srv/www.dynare.org/snapshot_ecb/source/ && ln -sf *.tar.xz /srv/www.dynare.org/snapshot_ecb/source/dynare-latest-src.tar.xz
- - f=(windows/exe/*) && cp ${f[0]} /srv/www.dynare.org/snapshot_ecb/windows/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot_ecb/windows/dynare-latest-win.exe
- - f=(windows/7z/*) && cp ${f[0]} /srv/www.dynare.org/snapshot_ecb/windows-7z/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot_ecb/windows-7z/dynare-latest-win.7z
- - f=(windows/zip/*) && cp ${f[0]} /srv/www.dynare.org/snapshot_ecb/windows-zip/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot_ecb/windows-zip/dynare-latest-win.zip
- - f=(macOS/pkg/*) && cp ${f[0]} /srv/www.dynare.org/snapshot_ecb/macos/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot_ecb/macos/dynare-latest-macos.pkg
- - ~/update-snapshot_ecb-list.sh
+ - rm -rf doc/manual/build/html/_static/mathjax
+ - ln -s /usr/share/javascript/mathjax doc/manual/build/html/_static/mathjax
+ - rsync --recursive --links --delete doc/manual/build/html/ /srv/www.dynare.org/manual-unstable/
-deploy_release_enterprise:
+deploy_snapshot_unstable:
stage: deploy
rules:
- - if: '$CI_PROJECT_NAMESPACE == "Enterprise" && $CI_COMMIT_TAG =~ /^enterprise-.*/'
+ - if: '$CI_PROJECT_NAMESPACE == "Dynare" && $CI_COMMIT_REF_NAME == "master"'
when: on_success
- when: never
tags:
@@ -232,8 +226,10 @@ deploy_release_enterprise:
- pkg_macOS
script:
- f=(windows/exe/*) && osslsigncode sign -pkcs12 ~/cepremap-comodo-sectigo-code-signing.p12 -n Dynare -i https://www.dynare.org -t http://timestamp.comodoca.com -in ${f[0]} -out ${f[0]}.signed && mv ${f[0]}.signed ${f[0]}
- - cp *.tar.xz /srv/www.dynare.org/release_ecb/source/
- - cp windows/exe/* /srv/www.dynare.org/release_ecb/windows/
- - cp windows/7z/* /srv/www.dynare.org/release_ecb/windows-7z/
- - cp windows/zip/* /srv/www.dynare.org/release_ecb/windows-zip/
- - cp macOS/pkg/* /srv/www.dynare.org/release_ecb/macos/
+ - cp *.tar.xz /srv/www.dynare.org/snapshot/source/ && ln -sf *.tar.xz /srv/www.dynare.org/snapshot/source/dynare-latest-src.tar.xz
+ - f=(windows/exe/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows/dynare-latest-win.exe
+ - f=(windows/7z/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows-7z/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows-7z/dynare-latest-win.7z
+ - f=(windows/zip/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/windows-zip/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/windows-zip/dynare-latest-win.zip
+ - f=(macOS/pkg/*) && cp ${f[0]} /srv/www.dynare.org/snapshot/macos/ && ln -sf ${f[0]##*/} /srv/www.dynare.org/snapshot/macos/dynare-latest-macos.pkg
+ - ~/update-snapshot-list.sh
+ - curl -X POST -F token="$WEBSITE_PIPELINE_TRIGGER_TOKEN" -F ref=master https://git.dynare.org/api/v4/projects/40/trigger/pipeline
diff --git a/.gitmodules b/.gitmodules
index b665d1eebe604f3606d2374cfa939d1296842116..048a6b0f6207afacc75b7a204dd9a1606d0df0df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
url = ../../Dynare/particles.git
[submodule "matlab/modules/dseries"]
path = matlab/modules/dseries
- url = ../../Enterprise/dseries.git
+ url = ../../Dynare/dseries.git
branch = enterprise
[submodule "matlab/modules/reporting"]
path = matlab/modules/reporting
@@ -28,4 +28,4 @@
url = https://github.com/fangq/jsonlab.git
[submodule "preprocessor"]
path = preprocessor
- url = ../../Enterprise/preprocessor.git
+ url = ../../Dynare/preprocessor.git