diff --git a/.circleci/config.yml b/.circleci/config.yml index b4d103f4b40..d72cb595142 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2617,28 +2617,28 @@ workflows: - compile_app_server filters: branches: - only: main + only: nolonger_main - push_app_stg: requires: - build_app filters: branches: - only: main + only: nolonger_main - push_migrations_stg: requires: - build_migrations filters: branches: - only: main + only: nolonger_main - push_tasks_stg: requires: - build_tasks filters: branches: - only: main + only: nolonger_main - check_circle_against_stg_sha: requires: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f99c9c1c2d2..94691fb7d38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ stages: #set safe directory and path .setup_milmove_env: &setup_milmove_env - git config --global --add safe.directory /builds/milmove/mymove - - export PATH=${PATH}:${GOPATH}/bin:~/transcom/mymove/builds/milmove/mymove + - export PATH=${PATH}:${GOPATH}/bin:~/transcom/mymove/builds/milmove/mymove:/builds/milmove/mymove/scripts - export REACT_APP_ERROR_LOGGING=otel .announce_failure: &announce_failure @@ -298,6 +298,7 @@ sast: stage: pre_checks tags: - $RUNNER_TAG + interruptible: true include: - template: Jobs/SAST.gitlab-ci.yml - template: Jobs/Dependency-Scanning.gitlab-ci.yml @@ -336,6 +337,7 @@ anti_virus: # This is needed for things like pdfjs-dist prep_server_hosted_client_deps: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -352,6 +354,7 @@ prep_server_hosted_client_deps: pre_deps_golang: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -383,6 +386,7 @@ pre_deps_golang: pre_deps_yarn: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -413,6 +417,7 @@ check_generated_code: check_tls_certificate_dp3: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE # Replace with your appropriate Docker image. @@ -437,6 +442,7 @@ check_tls_certificate_dp3: check_tls_certificate_stg: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -451,6 +457,7 @@ check_tls_certificate_stg: check_tls_certificate_prd: stage: pre_checks + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -465,6 +472,7 @@ check_tls_certificate_prd: build_storybook: stage: build + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -493,6 +501,7 @@ build_storybook: deploy_storybook_dp3: stage: deploy + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -514,6 +523,7 @@ deploy_storybook_dp3: compile_app_client: stage: build + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -546,6 +556,7 @@ compile_app_client: compile_app_server: stage: build + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -594,6 +605,7 @@ compile_app_server: pre_test: stage: test + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -652,6 +664,7 @@ pre_test: server_test: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -722,6 +735,7 @@ server_test: server_test_coverage: stage: test + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -752,6 +766,7 @@ server_test_coverage: client_test: stage: test + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -788,6 +803,7 @@ client_test: client_test_coverage: stage: test + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -811,6 +827,7 @@ client_test_coverage: integration_test_devseed: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -860,6 +877,7 @@ integration_test_devseed: integration_tests: stage: test + interruptible: true tags: - $RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -884,6 +902,7 @@ integration_tests: integration_test_mtls: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -936,6 +955,7 @@ integration_test_mtls: integration_test_admin: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -993,6 +1013,7 @@ integration_test_admin: integration_test_my: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -1051,6 +1072,7 @@ integration_test_my: integration_test_office: stage: test + interruptible: true tags: - $DOCKER_RUNNER_TAG image: $DOCKER_APP_IMAGE @@ -1111,6 +1133,7 @@ integration_test_office: ############################################################### build_push_app_dp3: stage: push + interruptible: true tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1134,6 +1157,7 @@ build_push_app_dp3: build_push_migrations_dp3: stage: push + interruptible: true tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1157,6 +1181,7 @@ build_push_migrations_dp3: build_push_tasks_dp3: stage: push + interruptible: true tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1180,6 +1205,7 @@ build_push_tasks_dp3: push_otel_collector_image_dp3: stage: push + interruptible: true tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1212,6 +1238,7 @@ push_otel_collector_image_dp3: deploy_migrations_dp3: stage: deploy + resource_group: $DP3_ENV tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1243,6 +1270,7 @@ deploy_migrations_dp3: deploy_tasks_dp3: stage: deploy + resource_group: $DP3_ENV tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1271,6 +1299,7 @@ deploy_tasks_dp3: deploy_app_client_tls_dp3: stage: deploy + resource_group: $DP3_ENV tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1312,6 +1341,7 @@ deploy_app_client_tls_dp3: deploy_app_dp3: stage: deploy + resource_group: $DP3_ENV tags: - $RUNNER_TAG environment: $DP3_ENV @@ -1366,6 +1396,7 @@ deploy_app_dp3: build_push_app_stg: stage: push + interruptible: true tags: - $RUNNER_TAG environment: stg @@ -1389,6 +1420,7 @@ build_push_app_stg: build_push_migrations_stg: stage: push + interruptible: true tags: - $RUNNER_TAG environment: stg @@ -1412,6 +1444,7 @@ build_push_migrations_stg: build_push_tasks_stg: stage: push + interruptible: true tags: - $RUNNER_TAG environment: stg @@ -1435,6 +1468,7 @@ build_push_tasks_stg: push_otel_collector_image_stg: stage: push + interruptible: true tags: - $RUNNER_TAG environment: stg @@ -1467,6 +1501,7 @@ push_otel_collector_image_stg: deploy_migrations_stg: stage: deploy + resource_group: staging tags: - $RUNNER_TAG environment: stg @@ -1498,6 +1533,7 @@ deploy_migrations_stg: deploy_tasks_stg: stage: deploy + resource_group: staging tags: - $RUNNER_TAG environment: stg @@ -1526,6 +1562,7 @@ deploy_tasks_stg: deploy_app_client_tls_stg: stage: deploy + resource_group: staging environment: stg image: name: $DOCKER_APP_IMAGE @@ -1566,6 +1603,7 @@ deploy_app_client_tls_stg: deploy_app_stg: stage: deploy + resource_group: staging tags: - $RUNNER_TAG environment: stg @@ -1620,6 +1658,7 @@ deploy_app_stg: ############################################################################## prod_approval: stage: prod_approval + resource_group: production tags: - $RUNNER_TAG environment: prd_approval @@ -1637,6 +1676,7 @@ prod_approval: build_push_app_prd: stage: push_prd + resource_group: production environment: prd image: name: gcr.io/kaniko-project/executor:v1.14.0-debug @@ -1659,6 +1699,7 @@ build_push_app_prd: build_push_migrations_prd: stage: push_prd + resource_group: production tags: - $RUNNER_TAG environment: prd @@ -1683,6 +1724,7 @@ build_push_migrations_prd: build_push_tasks_prd: stage: push_prd + resource_group: production environment: prd tags: - $RUNNER_TAG @@ -1707,6 +1749,7 @@ build_push_tasks_prd: push_otel_collector_image_prd: stage: push_prd + resource_group: production tags: - $RUNNER_TAG environment: prd @@ -1740,6 +1783,7 @@ push_otel_collector_image_prd: deploy_migrations_prd: stage: deploy_prd + resource_group: production environment: prd tags: - $RUNNER_TAG @@ -1771,6 +1815,7 @@ deploy_migrations_prd: deploy_tasks_prd: stage: deploy_prd + resource_group: production environment: prd tags: - $RUNNER_TAG @@ -1799,6 +1844,7 @@ deploy_tasks_prd: deploy_app_client_tls_prd: stage: deploy_prd + resource_group: production environment: prd tags: - $RUNNER_TAG @@ -1841,6 +1887,7 @@ deploy_app_client_tls_prd: deploy_app_prd: stage: deploy_prd + resource_group: production tags: - $RUNNER_TAG environment: prd diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9df9ef29fe7..a3a309e7285 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -160,7 +160,6 @@ repos: hooks: - id: gen-docs args: ['docs/adr'] - - id: circleci-validate - id: markdown-toc - id: hadolint diff --git a/Makefile b/Makefile index 50282d6aab1..6d3f51056fd 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,15 @@ ifdef CIRCLECI endif endif +ifdef GITLAB + DB_PORT_DEV=5432 + DB_PORT_TEST=5432 + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Linux) + LDFLAGS=-linkmode external -extldflags -static + endif +endif + ifdef GOLAND GOLAND_GC_FLAGS=all=-N -l endif diff --git a/scripts/psql-wrapper b/scripts/psql-wrapper index 1499958be01..0b7c4ab9f51 100755 --- a/scripts/psql-wrapper +++ b/scripts/psql-wrapper @@ -13,6 +13,8 @@ command="${*:-}" # nix-friendly option if [ -n "${NIX_PROFILE+x}" ]; then psql_exe="/nix/var/nix/profiles/per-user/${LOGNAME}/mymove/bin/psql" +elif [[ $(uname -s) == "Linux" ]]; then + psql_exe="/usr/bin/psql" else # Check if Homebrew is installed and fail with an error message if it isn't for # some reason. diff --git a/src/constants/MoveHistory/EventTemplates/FinishDocumentReview/FinishDocumentReviewMoves.jsx b/src/constants/MoveHistory/EventTemplates/FinishDocumentReview/FinishDocumentReviewMoves.jsx new file mode 100644 index 00000000000..1764fc61497 --- /dev/null +++ b/src/constants/MoveHistory/EventTemplates/FinishDocumentReview/FinishDocumentReviewMoves.jsx @@ -0,0 +1,18 @@ +import React from 'react'; + +import o from 'constants/MoveHistory/UIDisplay/Operations'; +import a from 'constants/MoveHistory/Database/Actions'; +import t from 'constants/MoveHistory/Database/Tables'; + +export default { + action: a.UPDATE, + eventName: o.finishDocumentReview, + tableName: t.moves, + getEventNameDisplay: () => 'Updated move', + getDetails: ({ changedValues }) => ( + <> +