diff --git a/.gflowrc b/.gflowrc index 272a63099bb..54e2e8dbdae 100644 --- a/.gflowrc +++ b/.gflowrc @@ -1,7 +1,7 @@ { "flow": "gflow", "remote": "origin", - "develop": "production", + "develop": "alpha", "production": "production", "ignores": [], "syncAfterFinish": false, diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04ad416f731..3c079a7ead5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: push: branches: [production, alpha, beta, rc] pull_request: - branches: [production] + branches: [production, alpha, beta, rc] types: [opened, synchronize, closed] concurrency: diff --git a/packages/platform/platform-cache/vitest.config.mts b/packages/platform/platform-cache/vitest.config.mts index 3171b9bd5bd..b42ac08c19d 100644 --- a/packages/platform/platform-cache/vitest.config.mts +++ b/packages/platform/platform-cache/vitest.config.mts @@ -11,11 +11,11 @@ export default defineConfig( ...presets.test.coverage, thresholds: { statements: 100, - branches: 94.21, + branches: 94.16, functions: 100, lines: 100 } } } } -); \ No newline at end of file +); diff --git a/packages/platform/platform-koa/vitest.config.mts b/packages/platform/platform-koa/vitest.config.mts index ca838a14781..510b341b8f9 100644 --- a/packages/platform/platform-koa/vitest.config.mts +++ b/packages/platform/platform-koa/vitest.config.mts @@ -11,11 +11,11 @@ export default defineConfig( ...presets.test.coverage, thresholds: { statements: 99.15, - branches: 95.65, + branches: 95.6, functions: 100, lines: 99.15 } } } } -); \ No newline at end of file +); diff --git a/packages/security/oidc-provider/src/services/OidcProvider.spec.ts b/packages/security/oidc-provider/src/services/OidcProvider.spec.ts index 179b2eda3af..655e93a95c2 100644 --- a/packages/security/oidc-provider/src/services/OidcProvider.spec.ts +++ b/packages/security/oidc-provider/src/services/OidcProvider.spec.ts @@ -57,7 +57,7 @@ describe("OidcProvider", () => { ); expect((oidcProvider as any).injector.logger.error).toHaveBeenCalledWith({ - duration: 0, + duration: expect.any(Number), reqId: "", account_id: "account_id", error: {error_description: "error_description", error_detail: "error_detail", error: "error"}, diff --git a/packages/third-parties/formio/src/FormioModule.spec.ts b/packages/third-parties/formio/src/FormioModule.spec.ts index 71b4753db15..5476eaa6ead 100644 --- a/packages/third-parties/formio/src/FormioModule.spec.ts +++ b/packages/third-parties/formio/src/FormioModule.spec.ts @@ -103,7 +103,7 @@ describe("FormioModule", () => { method: "get", methodClassName: "operationId", name: "operationId", - url: "/path/to" + url: "/projects/path/to" } ]); }); diff --git a/packages/third-parties/temporal/vitest.config.mts b/packages/third-parties/temporal/vitest.config.mts index 2124059829f..62dea5b443f 100644 --- a/packages/third-parties/temporal/vitest.config.mts +++ b/packages/third-parties/temporal/vitest.config.mts @@ -11,11 +11,11 @@ export default defineConfig( ...presets.test.coverage, thresholds: { statements: 92.36, - branches: 70.37, + branches: 69.23, functions: 88.88, lines: 92.36 } } } } -); \ No newline at end of file +);