Merge branch 'main' into production

.gitlab-ci.yml

@@ -23,9 +23,7 @@ default:
     - 1cpu-4gb # default small, configure more explicitly on specific jobs
   before_script:
     - set -e
-    # env -0 | sort -z | tr '\0' '\n': Sort env output alphabetically, keeping multiline variables intact
-    # egrep: Remove sensitive information from the output of env
-    #- env -0 | sort -z | tr '\0' '\n' | egrep -ve '^(DOCKER_AUTH_CONFIG|GOOGLE_APPLICATION_CREDENTIALS)=.*'
+    # DANGER don't use `set -x` or print the environment via e.g. `env` in pipeline runs, this might leak credentials (has leaked them)
 
 stages:
   - prepare

.gitlab/ci/deploy.yml

@@ -82,8 +82,9 @@ deploy:staging:infra:
   environment:
     name: staging
     url: https://staging.moderation.holi.social
-  only:
-    - main
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: on_success
 
 ###
 # PRODUCTION
@@ -94,5 +95,6 @@ deploy:production:infra:
   environment:
     name: production
     url: https://moderation.holi.social
-  only:
-    - production
+  rules:
+    - if: $CI_COMMIT_BRANCH == "production"
\ No newline at end of file
+      when: on_success

.gitlab/ci/prepare.yml

@@ -6,8 +6,10 @@ apps:prepare:
     - corepack enable
     - corepack yarn install --immutable
   rules:
-    # Execute step if yarn.lock was changed or cache is missing
-    # Inspired by https://gitlab.com/gitlab-org/gitlab/-/issues/244932#note_1727726890
+    # always run when triggered manually
+    - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "web"
+      when: on_success
+    # only run on specific file changes when triggered by git push
     - if: $CI_COMMIT_BRANCH
       changes: 
       - yarn.lock

.terraform-version

-1.11.0
+1.11.2