diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index c449365..666920a 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -17,7 +17,7 @@ current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | select( .name | contains("start") or contains("rc") or contains("beta") or contains("alpha") | not ) | .tag_name' | sort -V | tail -1) sha=$(curl --silent "https://api.github.com/repos/nocodb/nocodb-seed/commits/main" | jq -r '.sha') # Later down the script, we assume the version has only digits and dots diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 5084590..137e440 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} diff --git a/README.md b/README.md index eca2215..ccc3ce6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # NocoDB for YunoHost -[![Integration level](https://dash.yunohost.org/integration/nocodb.svg)](https://dash.yunohost.org/appci/app/nocodb) ![Working status](https://ci-apps.yunohost.org/ci/badges/nocodb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/nocodb.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/nocodb.svg)](https://dash.yunohost.org/appci/app/nocodb) ![Working status](https://ci-apps.yunohost.org/ci/badges/nocodb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/nocodb.maintain.svg) + [![Install NocoDB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nocodb) *[Lire ce readme en français.](./README_fr.md)* @@ -27,7 +28,7 @@ NocoDB is an open source NoCode platform that turns any database into a smart sp *(from NocoDB's website)* -**Shipped version:** 0.100.1~ynh1 +**Shipped version:** 0.109.5~ynh1 **Demo:** https://www.nocodb.com/demos diff --git a/README_fr.md b/README_fr.md index 8a25964..af9c705 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # NocoDB pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/nocodb.svg)](https://dash.yunohost.org/appci/app/nocodb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/nocodb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/nocodb.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/nocodb.svg)](https://dash.yunohost.org/appci/app/nocodb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/nocodb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/nocodb.maintain.svg) + [![Installer NocoDB avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nocodb) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer NocoDB rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer NocoDB rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble NocoDB is an open source NoCode platform that turns any database into a smart spreadsheet, alternative to Airtable. @@ -27,13 +28,13 @@ NocoDB is an open source NoCode platform that turns any database into a smart sp *(from NocoDB's website)* -**Version incluse :** 0.100.1~ynh1 +**Version incluse :** 0.109.5~ynh1 **Démo :** https://www.nocodb.com/demos -## Captures d'écran +## Captures d’écran -![Capture d'écran de NocoDB](./doc/screenshots/example.png) +![Capture d’écran de NocoDB](./doc/screenshots/example.png) ## Avertissements / informations importantes @@ -43,8 +44,8 @@ NocoDB has its own authentication system which does not rely on YunoHost's SSO o ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -60,4 +61,4 @@ ou sudo yunohost app upgrade nocodb -u https://github.com/YunoHost-Apps/nocodb_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 85760d0..f0d921f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/nocodb/nocodb-seed/archive/3cdeeb7d0d130850177b47c6215a84f6b4a34548.zip -SOURCE_SUM=63f30dd9892e4558140c5a5ffc62ed7aa613aca05fddeb68c6ba153d5043c8cb +SOURCE_URL=https://github.com/nocodb/nocodb-seed/archive/2b5afac041b038009d9f90fc73ed3f5c987f3a27.zip +SOURCE_SUM=1861cb06ee6bf0e3aa1c219b4b3bc540db88375287ae1df9fffc2b5c07b1d953 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_EXTRACT=true diff --git a/conf/env b/conf/env index 886f169..6408910 100644 --- a/conf/env +++ b/conf/env @@ -1,5 +1,7 @@ -NODE_ENV=dev +NODE_ENV=production PORT=__PORT__ NC_DB=mysql2://localhost:3306?u=__DB_USER__&p=__DB_PWD__&d=__DB_NAME__ NC_AUTH_JWT_SECRET=__JWT_SECRET__ NC_DISABLE_TELE=1 +NC_PUBLIC_URL=https://__DOMAIN__ +NC_REQUEST_BODY_SIZE=104857600 diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ce91ce..5a49c3e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,6 +10,8 @@ location __PATH__/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; + client_max_body_size 100M; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index f4d1958..a995c84 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "No-code platform that turns any database into a smart spreadsheet", "fr": "Plateform sans code qui transforme toute base de données en un tableur intelligent." }, - "version": "0.100.1~ynh1", + "version": "0.109.5~ynh1", "url": "https://www.nocodb.com", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/change_url b/scripts/change_url index 6d59ec1..71d1f51 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -115,7 +115,7 @@ fi ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Visit : localhost:" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="application successfully started" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 7f84c04..ae18b13 100755 --- a/scripts/install +++ b/scripts/install @@ -130,7 +130,7 @@ pushd $final_path ynh_print_info --message="...Done! Installing NocoDB now..." fi - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV="production" $ynh_npm install --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV="production" $ynh_npm install --save nocodb@$(ynh_app_upstream_version) popd #================================================= @@ -174,7 +174,7 @@ yunohost service add $app --description="$app daemon, turns any database into a ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Visit : localhost:" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="application successfully started" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 0af2d78..588d3f5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -125,7 +125,7 @@ yunohost service add $app --description="$app daemon, turns any database into a #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Visit : localhost:" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="application successfully started" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 04ee26d..b85ba79 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,7 +118,8 @@ pushd $final_path ynh_print_info --message="...Done! Installing NocoDB now..." fi - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV="production" $ynh_npm install --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV="production" $ynh_npm uninstall nocodb + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV="production" $ynh_npm install --save nocodb@$(ynh_app_upstream_version) popd #================================================= @@ -151,7 +152,7 @@ yunohost service add $app --description="$app daemon, turns any database into a #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Visit : localhost:" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="application successfully started" #================================================= # RELOAD NGINX