-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into iain/fix-service-account-secrets
- Loading branch information
Showing
661 changed files
with
34,319 additions
and
12,054 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,16 +16,23 @@ workflows: | |
| - main | ||
| - hotfix* | ||
|
|
||
| - test-server: | ||
| - test-server: &test-server-job-definition | ||
| context: | ||
| - speckle-server-licensing | ||
| - stripe-integration | ||
| filters: &filters-allow-all | ||
| tags: | ||
| # run tests for any commit on any branch, including any tags | ||
| only: /.*/ | ||
| requires: | ||
| - docker-publish-postgres-container | ||
|
|
||
| - test-server-no-ff: | ||
| filters: *filters-allow-all | ||
| requires: | ||
| - docker-publish-postgres-container | ||
|
|
||
| - test-server-multiregion: *test-server-job-definition | ||
|
|
||
| - test-frontend-2: | ||
| filters: *filters-allow-all | ||
|
|
@@ -145,6 +152,12 @@ workflows: | |
| requires: | ||
| - get-version | ||
|
|
||
| - docker-build-postgres-container: | ||
| context: *build-context | ||
| filters: *filters-build | ||
| requires: | ||
| - get-version | ||
|
|
||
| - docker-build-monitor-container: | ||
| context: *build-context | ||
| filters: *filters-build | ||
|
|
@@ -179,6 +192,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-frontend: | ||
|
|
@@ -194,6 +208,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-frontend-2: | ||
|
|
@@ -209,6 +224,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-webhooks: | ||
|
|
@@ -224,6 +240,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-file-imports: | ||
|
|
@@ -239,6 +256,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-previews: | ||
|
|
@@ -254,6 +272,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-test-container: | ||
|
|
@@ -269,8 +288,15 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-postgres-container: | ||
| context: *docker-hub-context | ||
| filters: *filters-publish | ||
| requires: | ||
| - docker-build-postgres-container | ||
|
|
||
| - docker-publish-monitor-container: | ||
| context: *docker-hub-context | ||
| filters: *filters-publish | ||
|
|
@@ -284,6 +310,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - docker-publish-docker-compose-ingress: | ||
|
|
@@ -299,6 +326,7 @@ workflows: | |
| - test-objectsender | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-preview-service | ||
|
|
||
| - publish-helm-chart: | ||
|
|
@@ -339,6 +367,7 @@ workflows: | |
| - get-version | ||
| - test-server | ||
| - test-server-no-ff | ||
| - test-server-multiregion | ||
| - test-ui-components | ||
| - test-frontend-2 | ||
| - test-viewer | ||
|
|
@@ -438,11 +467,12 @@ jobs: | |
| docker: | ||
| - image: cimg/node:18.19.0 | ||
| - image: cimg/redis:7.2.4 | ||
| - image: cimg/postgres:14.11 | ||
| - image: 'speckle/speckle-postgres' | ||
| environment: | ||
| POSTGRES_DB: speckle2_test | ||
| POSTGRES_PASSWORD: speckle | ||
| POSTGRES_USER: speckle | ||
| command: -c 'max_connections=1000' | ||
| - image: 'minio/minio' | ||
| command: server /data --console-address ":9001" | ||
| # environment: | ||
|
|
@@ -452,6 +482,7 @@ jobs: | |
| NODE_ENV: test | ||
| DATABASE_URL: 'postgres://speckle:[email protected]:5432/speckle2_test' | ||
| PGDATABASE: speckle2_test | ||
| POSTGRES_MAX_CONNECTIONS_SERVER: 20 | ||
| PGUSER: speckle | ||
| SESSION_SECRET: 'keyboard cat' | ||
| STRATEGY_LOCAL: 'true' | ||
|
|
@@ -464,6 +495,7 @@ jobs: | |
| REDIS_URL: 'redis://127.0.0.1:6379' | ||
| S3_REGION: '' # optional, defaults to 'us-east-1' | ||
| AUTOMATE_ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json' | ||
| FF_BILLING_INTEGRATION_ENABLED: 'true' | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
|
|
@@ -550,6 +582,52 @@ jobs: | |
| FF_WORKSPACES_SSO_ENABLED: 'false' | ||
| FF_MULTIPLE_EMAILS_MODULE_ENABLED: 'false' | ||
| FF_GENDOAI_MODULE_ENABLED: 'false' | ||
| FF_GATEKEEPER_MODULE_ENABLED: 'false' | ||
| FF_BILLING_INTEGRATION_ENABLED: 'false' | ||
|
|
||
| test-server-multiregion: | ||
| <<: *test-server-job | ||
| docker: | ||
| - image: cimg/node:18.19.0 | ||
| - image: cimg/redis:7.2.4 | ||
| - image: 'speckle/speckle-postgres' | ||
| environment: | ||
| POSTGRES_DB: speckle2_test | ||
| POSTGRES_PASSWORD: speckle | ||
| POSTGRES_USER: speckle | ||
| command: -c 'max_connections=1000' -c 'wal_level=logical' | ||
| - image: 'speckle/speckle-postgres' | ||
| environment: | ||
| POSTGRES_DB: speckle2_test | ||
| POSTGRES_PASSWORD: speckle | ||
| POSTGRES_USER: speckle | ||
| command: -c 'max_connections=1000' -c 'port=5433' -c 'wal_level=logical' | ||
| - image: 'minio/minio' | ||
| command: server /data --console-address ":9001" | ||
| environment: | ||
| # Same as test-server: | ||
| NODE_ENV: test | ||
| DATABASE_URL: 'postgres://speckle:[email protected]:5432/speckle2_test' | ||
| PGDATABASE: speckle2_test | ||
| POSTGRES_MAX_CONNECTIONS_SERVER: 20 | ||
| PGUSER: speckle | ||
| SESSION_SECRET: 'keyboard cat' | ||
| STRATEGY_LOCAL: 'true' | ||
| CANONICAL_URL: 'http://127.0.0.1:3000' | ||
| S3_ENDPOINT: 'http://127.0.0.1:9000' | ||
| S3_ACCESS_KEY: 'minioadmin' | ||
| S3_SECRET_KEY: 'minioadmin' | ||
| S3_BUCKET: 'speckle-server' | ||
| S3_CREATE_BUCKET: 'true' | ||
| REDIS_URL: 'redis://127.0.0.1:6379' | ||
| S3_REGION: '' # optional, defaults to 'us-east-1' | ||
| AUTOMATE_ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json' | ||
| FF_BILLING_INTEGRATION_ENABLED: 'true' | ||
| # These are the only different env keys: | ||
| MULTI_REGION_CONFIG_PATH: '../../.circleci/multiregion.test-ci.json' | ||
| FF_WORKSPACES_MODULE_ENABLED: 'true' | ||
| FF_WORKSPACES_MULTI_REGION_ENABLED: 'true' | ||
| RUN_TESTS_IN_MULTIREGION_MODE: true | ||
|
|
||
| test-frontend-2: | ||
| docker: &docker-node-browsers-image | ||
|
|
@@ -618,7 +696,7 @@ jobs: | |
| test-preview-service: | ||
| docker: | ||
| - image: cimg/node:18.19.0 | ||
| - image: cimg/postgres:14.11 | ||
| - image: cimg/postgres:16.4@sha256:2e4f1a965bdd9ba77aa6a0a7b93968c07576ba2a8a7cf86d5eb7b31483db1378 | ||
| environment: | ||
| POSTGRES_DB: preview_service_test | ||
| POSTGRES_PASSWORD: preview_service_test | ||
|
|
@@ -965,6 +1043,12 @@ jobs: | |
| FOLDER: utils | ||
| SPECKLE_SERVER_PACKAGE: test-deployment | ||
|
|
||
| docker-build-postgres-container: | ||
| <<: *build-job | ||
| environment: | ||
| FOLDER: utils | ||
| SPECKLE_SERVER_PACKAGE: postgres | ||
|
|
||
| docker-build-monitor-container: | ||
| <<: *build-job | ||
| environment: | ||
|
|
@@ -1029,6 +1113,12 @@ jobs: | |
| FOLDER: utils | ||
| SPECKLE_SERVER_PACKAGE: test-deployment | ||
|
|
||
| docker-publish-postgres-container: | ||
| <<: *publish-job | ||
| environment: | ||
| FOLDER: utils | ||
| SPECKLE_SERVER_PACKAGE: postgres | ||
|
|
||
| docker-publish-monitor-container: | ||
| <<: *publish-job | ||
| environment: | ||
|
|
@@ -1117,6 +1207,7 @@ jobs: | |
| publish-viewer-sandbox-cloudflare-pages: | ||
| docker: *docker-node-image | ||
| working_directory: *work-dir | ||
| resource_class: large | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "main": { | ||
| "postgres": { | ||
| "connectionUri": "postgresql://speckle:[email protected]:5432/speckle2_test" | ||
| } | ||
| }, | ||
| "regions": { | ||
| "region1": { | ||
| "postgres": { | ||
| "connectionUri": "postgresql://speckle:[email protected]:5433/speckle2_test" | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,4 +71,8 @@ minio-data/ | |
| postgres-data/ | ||
| redis-data/ | ||
|
|
||
| .tshy-build | ||
| .tshy-build | ||
|
|
||
| # Server | ||
| multiregion.json | ||
| multiregion.test.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.