Skip to content

Commit 9206806

Browse files
committed
Release 1.0.1
Merge branch 'main' into production
2 parents 87264e5 + dccd8ff commit 9206806

File tree

6 files changed

+154
-97
lines changed

6 files changed

+154
-97
lines changed

.circleci/config.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ workflows:
5757
- silta/drupal-deploy: &deploy
5858
name: deploy
5959
executor: silta
60-
silta_config: silta/silta.yml,silta/silta.secret
60+
silta_config: silta/silta.yml,silta/silta.secrets
6161
pre-release:
6262
- silta/decrypt-files:
63-
files: silta/silta.secret
63+
files: silta/silta.secrets
6464
# SEC_DRUPAL_PROJECT_SILTA_DEV holds the secret key for decryption purposes.
6565
# This is stored in CircleCI as an environment variable and also in LastPass.
6666
secret_key_env: SEC_DRUPAL_PROJECT_SILTA_DEV
@@ -96,7 +96,7 @@ workflows:
9696
- silta/drupal-deploy:
9797
<<: *deploy
9898
name: deploy-main
99-
silta_config: silta/silta.yml,silta/silta.secret,silta/silta-main.yml
99+
silta_config: silta/silta.yml,silta/silta.secrets,silta/silta-main.yml
100100
requires:
101101
- build-main
102102
filters:
@@ -122,7 +122,13 @@ workflows:
122122
- silta/drupal-deploy:
123123
<<: *deploy
124124
name: deploy-prod
125-
silta_config: silta/silta.yml,silta/silta-prod.yml
125+
silta_config: silta/silta.yml,silta/silta-prod.yml,silta/silta-prod.secrets
126+
pre-release:
127+
- silta/decrypt-files:
128+
files: silta/silta-prod.secrets
129+
# SEC_DRUPAL_PROJECT_SILTA_FINLAND holds the secret key for decryption purposes.
130+
# This is stored in CircleCI as an environment variable and also in LastPass.
131+
secret_key_env: SEC_DRUPAL_PROJECT_SILTA_FINLAND
126132
context: silta_finland
127133
requires:
128134
- build-prod

0 commit comments

Comments
 (0)