No commit message

steedos · Oct 10, 2023 · b191824 · b191824
2 parents 2d0e612 + 71807f5
commit b191824
Show file tree

Hide file tree

Showing 116 changed files with 762 additions and 709 deletions.
diff --git a/.github/workflows/npm-sync.yml b/.github/workflows/npm-sync.yml
@@ -9,10 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Sleep 120s, wait for npm cache
-        uses: juliangruber/sleep-action@v1
-        with:
-          time: 120s
+      # checkout branch 2.5
+      - name: Checkout branch 2.5
+        uses: actions/checkout@v2
+        with: 
+          ref: '2.5'
+
+      - run: yarn --frozen-lockfile
+
+      - name: Bootstrap platform
+        run: |
+          yarn bootstrap
 
       - name: Sync cnpm
         env:

diff --git a/appsmith b/appsmith
diff --git a/creator/packages/steedos-api/package.js b/creator/packages/steedos-api/package.js
@@ -59,7 +59,7 @@ Package.onUse(function(api) {
 
 	// api.addFiles('routes/s3.coffee', 'server');
 	// api.addFiles('routes/push.coffee', 'server');
-	// api.addFiles('routes/aliyun_push.coffee', 'server');
+	api.addFiles('routes/aliyun_push.coffee', 'server');
 	// api.addFiles('routes/import.coffee', 'server');
 	// api.addFiles('routes/proxy.coffee', 'server');
 

diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.5.15-beta.14",
+  "version": "2.5.15-beta.15",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.5.15-beta.14",
-    "@steedos/objectql": "2.5.15-beta.14",
-    "@steedos/service-package-loader": "2.5.15-beta.14",
+    "@steedos/accounts": "2.5.15-beta.15",
+    "@steedos/objectql": "2.5.15-beta.15",
+    "@steedos/service-package-loader": "2.5.15-beta.15",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "7b6dc80eeda6a50f30bbbd3185cfb49c6bdcf32c"
+  "gitHead": "afe78018132493f15da990933a120e113760bad6"
 }
diff --git a/examples/project-template/.env b/examples/project-template/.env
diff --git a/examples/project-template/.gitignore b/examples/project-template/.gitignore
diff --git a/examples/project-template/.vscode/extensions.json b/examples/project-template/.vscode/extensions.json
diff --git a/examples/project-template/.vscode/settings.json b/examples/project-template/.vscode/settings.json
diff --git a/examples/project-template/README.md b/examples/project-template/README.md
diff --git a/examples/project-template/docker-compose.yml b/examples/project-template/docker-compose.yml
diff --git a/examples/project-template/moleculer.config.js b/examples/project-template/moleculer.config.js
diff --git a/examples/project-template/package.json b/examples/project-template/package.json
diff --git a/examples/project-template/steedos-app/main/default/applications/new8.app.yml b/examples/project-template/steedos-app/main/default/applications/new8.app.yml
diff --git a/examples/project-template/steedos-app/package.json b/examples/project-template/steedos-app/package.json
diff --git a/examples/project-template/steedos-app/package.service.js b/examples/project-template/steedos-app/package.service.js
diff --git a/examples/project-template/steedos-app2/main/default/applications/new8.app.yml b/examples/project-template/steedos-app2/main/default/applications/new8.app.yml
diff --git a/examples/project-template/steedos.config.js b/examples/project-template/steedos.config.js