Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Sep 27, 2023
2 parents 154ebba + 4b2a11a commit 583c6de
Show file tree
Hide file tree
Showing 95 changed files with 387 additions and 595 deletions.
26 changes: 16 additions & 10 deletions .github/workflows/release-docker-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- completed
push:
branches:
- 'releases/**'
- 'release/**'

jobs:
docker:
Expand All @@ -22,8 +22,9 @@ jobs:

- name: Set Current Version
run: |
CURRENT_VERSION=$(node -p 'require("./lerna.json").version')
echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
STEEDOS_VERSION=$(node -p 'require("./lerna.json").version')
echo "STEEDOS_VERSION=${STEEDOS_VERSION}" >> $GITHUB_ENV
echo "STEEDOS_VERSION=${STEEDOS_VERSION}"
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
Expand All @@ -37,24 +38,29 @@ jobs:
images: |
steedos/steedos-enterprise
tags: |
type=ref,event=branch
type=ref,event=pr
type=schedule
type=semver,pattern={{version}},value=v${CURRENT_VERSION}
type=semver,pattern={{major}}.{{minor}},value=v${CURRENT_VERSION}
type=semver,pattern={{major}},value=v${CURRENT_VERSION}
type=semver,pattern={{version}},value=${{ env.STEEDOS_VERSION }}
type=semver,pattern={{major}}.{{minor}},value=${{ env.STEEDOS_VERSION }}
type=semver,pattern={{major}},value=${{ env.STEEDOS_VERSION }}
- uses: docker/login-action@v1
name: Login Docker Hub
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Replace Version ~2.5 to Tag
uses: jacobtomlinson/gha-find-replace@v2
with:
include: ./deploy/enterprise/fs/app/platform/package.json
find: "~2.5"
replace: ${{env.STEEDOS_VERSION}}
regex: false

- name: Build and push docker
uses: docker/build-push-action@v3
with:
context: ./deploy/enterprise
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
10 changes: 5 additions & 5 deletions ee/sso-oidc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/ee_sso-oidc",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"main": "package.service.js",
"scripts": {
"build": "tsc"
Expand All @@ -11,14 +11,14 @@
"access": "public"
},
"dependencies": {
"@steedos/accounts": "2.5.15-beta.4",
"@steedos/objectql": "2.5.15-beta.4",
"@steedos/service-package-loader": "2.5.15-beta.4",
"@steedos/accounts": "2.5.15-beta.6",
"@steedos/objectql": "2.5.15-beta.6",
"@steedos/service-package-loader": "2.5.15-beta.6",
"@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": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
4 changes: 2 additions & 2 deletions examples/project-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "project-template",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"private": true,
"scripts": {
"start": "steedos start",
Expand All @@ -9,6 +9,6 @@
"inspect": "cross-env NODE_OPTIONS='--inspect' steedos start --hot"
},
"dependencies": {
"@steedos/service-community": "2.5.15-beta.4"
"@steedos/service-community": "2.5.15-beta.6"
}
}
4 changes: 2 additions & 2 deletions examples/with-datadog/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "with-datadog",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"private": true,
"scripts": {
"start": "steedos start"
},
"dependencies": {
"@steedos/service-community": "2.5.15-beta.4"
"@steedos/service-community": "2.5.15-beta.6"
},
"devDependencies": {
"dd-trace": "3.7.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/with-k6/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "with-k6",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"private": true,
"scripts": {
"start": "steedos start",
"k6:graphql": "k6 run -e ROOT_URL=http://127.0.0.1:5000 -e API_KEY=xxx ./.script/test.graphql.js",
"k6:menus": "k6 run -e ROOT_URL=http://127.0.0.1:5100 -e API_KEY=apikey,8FzpeOTInPZcqWeFoCdSEy8s6FDpuITWPz15bIM0kNL ./.script/test.menus.js"
},
"dependencies": {
"@steedos/service-community": "2.5.15-beta.4"
"@steedos/service-community": "2.5.15-beta.6"
},
"devDependencies": {
"dd-trace": "3.7.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/with-postgres/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@steedos-examples/with-postgres",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"private": true,
"scripts": {
"start": "steedos start"
},
"dependencies": {
"@steedos/service-community": "2.5.15-beta.4"
"@steedos/service-community": "2.5.15-beta.6"
}
}
4 changes: 2 additions & 2 deletions examples/with-tracing-jaeger/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "with-tracing-jaeger",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"private": true,
"scripts": {
"start": "steedos start"
},
"dependencies": {
"@steedos/service-community": "2.5.15-beta.4"
"@steedos/service-community": "2.5.15-beta.6"
},
"devDependencies": {
"jaeger-client": "^3.19.0"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
],
"useWorkspaces": true,
"npmClient": "yarn",
"version": "2.5.15-beta.5"
"version": "2.5.15-beta.6"
}
12 changes: 6 additions & 6 deletions packages/accounts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/accounts",
"private": false,
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"main": "lib/index.js",
"files": [
"/package.json",
Expand Down Expand Up @@ -55,20 +55,20 @@
"validator": "^13.6.0"
},
"devDependencies": {
"@steedos/auth": "2.5.15-beta.4",
"@steedos/meteor-bundle-runner": "2.5.15-beta.4",
"@steedos/objectql": "2.5.15-beta.4",
"@steedos/auth": "2.5.15-beta.6",
"@steedos/meteor-bundle-runner": "2.5.15-beta.6",
"@steedos/objectql": "2.5.15-beta.6",
"@types/dotenv-flow": "^3.0.0",
"@types/node": "12.6.8",
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"dotenv-flow": "^3.1.0",
"nodemon": "^2.0.19",
"steedos-server": "2.5.15-beta.4",
"steedos-server": "2.5.15-beta.6",
"typescript": "4.6.3"
},
"publishConfig": {
"access": "public"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
8 changes: 4 additions & 4 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/auth",
"private": false,
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"main": "lib/index.js",
"scripts": {
"watch": "tsc --watch",
Expand All @@ -13,8 +13,8 @@
"access": "public"
},
"dependencies": {
"@steedos/cachers": "2.5.15-beta.4",
"@steedos/objectql": "2.5.15-beta.4",
"@steedos/cachers": "2.5.15-beta.6",
"@steedos/objectql": "2.5.15-beta.6",
"cookies": "^0.8.0",
"express": "^4.16.4",
"ismobilejs": "^1.1.1",
Expand All @@ -25,5 +25,5 @@
"devDependencies": {
"typescript": "4.6.3"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
4 changes: 2 additions & 2 deletions packages/cachers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/cachers",
"private": false,
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -19,5 +19,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
2 changes: 1 addition & 1 deletion packages/cli/default.steedos.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");

if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].7/dist/assets.json";
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].8/dist/assets.json";
}

if(_.isEmpty(process.env.SERIALIZER)){
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "steedos-cli",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"description": "Develop and run your enterprise apps in miniutes",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -38,8 +38,8 @@
"@oclif/command": "^1.8.16",
"@oclif/config": "^1.8.3",
"@oclif/plugin-help": "^5.1.12",
"@steedos/metadata-core": "2.5.15-beta.4",
"@steedos/metadata-registrar": "2.5.15-beta.4",
"@steedos/metadata-core": "2.5.15-beta.6",
"@steedos/metadata-registrar": "2.5.15-beta.6",
"archiver": "^5.0.2",
"chalk": "2.4.2",
"change-case": "^3.1.0",
Expand Down Expand Up @@ -82,5 +82,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
6 changes: 3 additions & 3 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": false,
"name": "@steedos/client",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"description": "client lib for steedos",
"main": "lib/index.js",
"scripts": {
Expand All @@ -17,8 +17,8 @@
},
"license": "MIT",
"dependencies": {
"@steedos/filters": "2.5.15-beta.4",
"@steedos/filters": "2.5.15-beta.6",
"node-fetch": "^2.6.7"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
24 changes: 12 additions & 12 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/core",
"private": false,
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -14,15 +14,15 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/auth": "2.5.15-beta.4",
"@steedos/filters": "2.5.15-beta.4",
"@steedos/i18n": "2.5.15-beta.4",
"@steedos/metadata-core": "2.5.15-beta.4",
"@steedos/migrate": "2.5.15-beta.4",
"@steedos/objectql": "2.5.15-beta.4",
"@steedos/odata-v4-mongodb": "2.5.15-beta.4",
"@steedos/process": "2.5.15-beta.4",
"@steedos/standard-objects": "2.5.15-beta.4",
"@steedos/auth": "2.5.15-beta.6",
"@steedos/filters": "2.5.15-beta.6",
"@steedos/i18n": "2.5.15-beta.6",
"@steedos/metadata-core": "2.5.15-beta.6",
"@steedos/migrate": "2.5.15-beta.6",
"@steedos/objectql": "2.5.15-beta.6",
"@steedos/odata-v4-mongodb": "2.5.15-beta.6",
"@steedos/process": "2.5.15-beta.6",
"@steedos/standard-objects": "2.5.15-beta.6",
"body-parser": "^1.18.1",
"bunyan-sfdx-no-dtrace": "^1.8.2",
"clone": "^2.1.2",
Expand All @@ -45,7 +45,7 @@
"devDependencies": {
"@salesforce/kit": "1.0.4",
"@salesforce/ts-types": "1.1.2",
"@steedos/meteor-bundle-runner": "2.5.15-beta.4",
"@steedos/meteor-bundle-runner": "2.5.15-beta.6",
"@types/express": "^4.16.1",
"@types/node": "^11.10.4",
"@types/underscore": "^1.8.13",
Expand All @@ -57,5 +57,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-app",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"keywords": [
"react",
"steedos"
Expand Down Expand Up @@ -48,5 +48,5 @@
"engines": {
"node": ">=12.22.0"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-package",
"version": "2.5.15-beta.4",
"version": "2.5.15-beta.6",
"keywords": [
"steedos"
],
Expand Down Expand Up @@ -39,5 +39,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b1b100489dfd0d18bbf07322b2da7142cfb92db9"
"gitHead": "a39f4f7c3dcb810eeade271506d3839a84678b4a"
}
Loading

0 comments on commit 583c6de

Please sign in to comment.