From 71ec651eb747758a5880fc43369b3e35b3db418d Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 13:03:26 +0100 Subject: [PATCH 01/12] Use older yarn version 1.19.2-1 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 78743bd..84df6c7 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn=1.19.2-1" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From aa9d743184ee9729fc9326a9675daf89c7dac746 Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 14:40:01 +0100 Subject: [PATCH 02/12] New attempt at pinning the version of yarn --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 84df6c7..33fecd9 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn=1.19.2-1" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn<=1.20" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From f1371a19e915b97695c0044fbf51820316de76e7 Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 14:58:46 +0100 Subject: [PATCH 03/12] Yet another attempt a pinning yarn version --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 33fecd9..8333b85 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn<=1.20" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn(<=1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From a4d1ac0d501bf0f98e14a7ef40e6c3f884afbadd Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 15:04:47 +0100 Subject: [PATCH 04/12] Again --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8333b85..f068e36 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn(<=1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn (<1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From d07bdbcd170e2c003f31edbc08369bfdf106c90e Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 15:07:19 +0100 Subject: [PATCH 05/12] Another attempt a pinning yarn version --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f068e36..100e260 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn (<1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn(<1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From 9dd8bb1c54d425f1b371a78d7e000787ef87e7ed Mon Sep 17 00:00:00 2001 From: Lab 8916100448256 Date: Mon, 9 Mar 2020 15:20:44 +0100 Subject: [PATCH 06/12] Revert failed attempt to pin version of yarn --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 100e260..78743bd 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn(<1.20)" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_nodejs 8 From 1a95f66b9a1997144c0803b5cda77c880d6a94ec Mon Sep 17 00:00:00 2001 From: Lab-8916100448256 <38373466+Lab-8916100448256@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:31:58 +0100 Subject: [PATCH 07/12] Update CodiMD version to 1.6.0 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 79beb92..bb9317d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/codimd/server/archive/1.5.0.tar.gz -SOURCE_SUM=2321fb054c85e5ffcb73443e3ea9fbf8c370387f2b5709a23c21f71233fdb454 +SOURCE_URL=https://github.com/codimd/server/archive/1.6.0.tar.gz +SOURCE_SUM=3639eaf70a37ee0513c75259c70b3d0c2c10116e9b2989dc9c571f98017120bd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 871ea3c2de23909aaefd70aa735f1c07db382b11 Mon Sep 17 00:00:00 2001 From: Lab-8916100448256 <38373466+Lab-8916100448256@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:38:20 +0100 Subject: [PATCH 08/12] Update CodiMD version to 1.6.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 728e628..60c73bb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A collaborative editor to work on notes written in Markdown -**Shipped version:** 1.5.0 +**Shipped version:** 1.6.0 **Status**: In progress, do *not* consider this app as stable and fully working (yet) From 637fd0551d1482923a1a6bfee61f9e24c30bf19c Mon Sep 17 00:00:00 2001 From: Lab-8916100448256 <38373466+Lab-8916100448256@users.noreply.github.com> Date: Mon, 9 Mar 2020 18:06:43 +0100 Subject: [PATCH 09/12] nodejs version 10 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 78743bd..0886114 100644 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ ynh_install_app_dependencies postgresql apt-transport-https # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" -ynh_install_nodejs 8 +ynh_install_nodejs 10 #============================================== # CREATE DB From 478ab3381ae609a50fef07a4553c821526e1ea19 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 27 Apr 2020 00:49:29 +0200 Subject: [PATCH 10/12] Use a real boolean for is_public default value in manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d8bf458..4f4b57b 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,7 @@ "en": "Is it a public site ?", "fr": "Est-ce un site public ?" }, - "default": "true" + "default": true } ] } From 2f988795c4de69251f672af5da2917090c1e397d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 27 Apr 2020 01:08:36 +0200 Subject: [PATCH 11/12] I believe it's much simpler to just copypasta the code from bin/setup into the install script --- scripts/install | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0886114..5b62179 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,21 @@ cp ../conf/.sequelizerc.example "$final_path"/.sequelizerc ynh_script_progression --message="Building application... (this may take some time and resources!)" pushd "$final_path" || exit -./bin/setup + +# ---- This is copypasta from https://raw.githubusercontent.com/codimd/server/master/bin/setup +if [ ! -f config.json ]; then + cp config.json.example config.json +fi + +if [ ! -f .sequelizerc ]; then + cp .sequelizerc.example .sequelizerc +fi + +yarn install +yarn install --production=false # FIXME: this doesn't sounds like what we want to have for a real deployment ? idk +# ---- End copypasta from https://raw.githubusercontent.com/codimd/server/master/bin/setup + + yarn run build #node_modules/.bin/sequelize db:migrate popd || exit From a152e5dc1073acec587bd00884ede9420352441f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 27 Apr 2020 04:01:30 +0200 Subject: [PATCH 12/12] Fix stupid bug in add_extra_apt_repo... --- scripts/install | 7 +++---- scripts/ynh_add_extra_apt_repos__3 | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 5b62179..98b906d 100644 --- a/scripts/install +++ b/scripts/install @@ -105,7 +105,7 @@ cp ../conf/.sequelizerc.example "$final_path"/.sequelizerc #============================================== # INSTALL CODIMD #============================================== -ynh_script_progression --message="Building application... (this may take some time and resources!)" +ynh_script_progression --message="Building application... (this will take some time and resources!)" pushd "$final_path" || exit @@ -118,11 +118,10 @@ if [ ! -f .sequelizerc ]; then cp .sequelizerc.example .sequelizerc fi -yarn install -yarn install --production=false # FIXME: this doesn't sounds like what we want to have for a real deployment ? idk +yarn install --non-interactive +yarn install --non-interactive --production=false # FIXME: this doesn't sounds like what we want to have for a real deployment ? idk # ---- End copypasta from https://raw.githubusercontent.com/codimd/server/master/bin/setup - yarn run build #node_modules/.bin/sequelize db:migrate popd || exit diff --git a/scripts/ynh_add_extra_apt_repos__3 b/scripts/ynh_add_extra_apt_repos__3 index ef9ba2d..3784020 100644 --- a/scripts/ynh_add_extra_apt_repos__3 +++ b/scripts/ynh_add_extra_apt_repos__3 @@ -128,7 +128,7 @@ ynh_install_extra_repo () { local component="${repo##$uri $suite }" # Add the repository into sources.list.d - ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" "$append" + ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append # Pin the new repo with the default priority, so it won't be used for upgrades. # Build $pin from the uri without http and any sub path @@ -139,7 +139,7 @@ ynh_install_extra_repo () { then priority="--priority=$priority" fi - ynh_pin_repo --package="*" --pin="origin \"$pin\"" "$priority" --name="$name" "$append" + ynh_pin_repo --package="*" --pin="origin \"$pin\"" "$priority" --name="$name" $append # Get the public key for the repo if [ -n "$key" ]