From c5e354e2c00ae4d272c9abebcc7b9c06d60c8bf1 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Fri, 3 Nov 2023 13:19:38 +1100 Subject: [PATCH] Removed D9 from theme CI and switched branches from `master` to `main`. --- .circleci/config.yml | 10 +++++----- .../contrib/civictheme/.circleci/config.yml | 18 ------------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c319f02d6..bef4382e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -462,7 +462,7 @@ jobs: command: | DEPLOY_SSH_FINGERPRINT=$DEPLOY_SSH_FINGERPRINT1 \ DEPLOY_CODE_COMMIT_REMOTE_REPO=git@github.com:salsadigitalauorg/civictheme.git \ - DEPLOY_CODE_COMMIT_REMOTE_BRANCH=master \ + DEPLOY_CODE_COMMIT_REMOTE_BRANCH=main \ DEPLOY_CODE_COMMIT_SRC_DIR="${DREVOPS_EXPORT_CODE_DIR}/web/themes/contrib/civictheme" \ ./scripts/deploy-code-commit.sh no_output_timeout: 30m @@ -471,7 +471,7 @@ jobs: command: | DEPLOY_SSH_FINGERPRINT=$DEPLOY_SSH_FINGERPRINT2 \ DEPLOY_CODE_COMMIT_REMOTE_REPO=git@github.com:salsadigitalauorg/civictheme_library.git \ - DEPLOY_CODE_COMMIT_REMOTE_BRANCH=master \ + DEPLOY_CODE_COMMIT_REMOTE_BRANCH=main \ DEPLOY_CODE_COMMIT_SRC_DIR="${DREVOPS_EXPORT_CODE_DIR}/web/themes/contrib/civictheme/civictheme_library" \ ./scripts/deploy-code-commit.sh no_output_timeout: 30m @@ -480,7 +480,7 @@ jobs: command: | DEPLOY_SSH_FINGERPRINT=$DEPLOY_SSH_FINGERPRINT3 \ DEPLOY_CODE_COMMIT_REMOTE_REPO=git@github.com:salsadigitalauorg/civictheme_govcms.git \ - DEPLOY_CODE_COMMIT_REMOTE_BRANCH=master \ + DEPLOY_CODE_COMMIT_REMOTE_BRANCH=main \ DEPLOY_CODE_COMMIT_SRC_DIR="${DREVOPS_EXPORT_CODE_DIR}/web/modules/custom/civictheme_govcms" \ ./scripts/deploy-code-commit.sh no_output_timeout: 30m @@ -489,7 +489,7 @@ jobs: command: | DEPLOY_SSH_FINGERPRINT=$DEPLOY_SSH_FINGERPRINT4 \ DEPLOY_CODE_COMMIT_REMOTE_REPO=git@github.com:salsadigitalauorg/civictheme_content.git \ - DEPLOY_CODE_COMMIT_REMOTE_BRANCH=master \ + DEPLOY_CODE_COMMIT_REMOTE_BRANCH=main \ DEPLOY_CODE_COMMIT_SRC_DIR="${DREVOPS_EXPORT_CODE_DIR}/web/modules/custom/civictheme_content" \ ./scripts/deploy-code-commit.sh no_output_timeout: 30m @@ -498,7 +498,7 @@ jobs: command: | DEPLOY_SSH_FINGERPRINT=$DEPLOY_SSH_FINGERPRINT5 \ DEPLOY_CODE_COMMIT_REMOTE_REPO=git@github.com:salsadigitalauorg/civictheme_admin.git \ - DEPLOY_CODE_COMMIT_REMOTE_BRANCH=master \ + DEPLOY_CODE_COMMIT_REMOTE_BRANCH=main \ DEPLOY_CODE_COMMIT_SRC_DIR="${DREVOPS_EXPORT_CODE_DIR}/web/modules/custom/civictheme_admin" \ ./scripts/deploy-code-commit.sh no_output_timeout: 30m diff --git a/web/themes/contrib/civictheme/.circleci/config.yml b/web/themes/contrib/civictheme/.circleci/config.yml index 33f7fd6c4..59bfee812 100644 --- a/web/themes/contrib/civictheme/.circleci/config.yml +++ b/web/themes/contrib/civictheme/.circleci/config.yml @@ -36,24 +36,6 @@ jobs: - image: cimg/php:8.2-browsers <<: *job-build - build-php-8.1-legacy: - <<: *container_config - docker: - - image: cimg/php:8.1-browsers - environment: - DRUPAL_VERSION: 9.5 - DRUPAL_PROJECT_SHA: 9.x - <<: *job-build - - build-php-8.2-legacy: - <<: *container_config - docker: - - image: cimg/php:8.2-browsers - environment: - DRUPAL_VERSION: 9.5 - DRUPAL_PROJECT_SHA: 9.x - <<: *job-build - build-php-8.2-next: <<: *container_config docker: