Merge branch '3028-update-circleci-settings' into qa

Iridescent-CM · Aug 27, 2021 · 9ffa957 · 9ffa957
2 parents 2a5a445 + e89192e
commit 9ffa957
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -41,25 +41,6 @@ Make sure XCode is installed.
 
 Under Xcode preferences locations, make sure there is a version set.
 
-
-Install qt5
-
-```
-brew install qt@5.5
-echo 'export PATH="$(brew --prefix qt@5.5)/bin:$PATH"' >> ~/.bashrc
-```
-
-After running this command:
-
-```
-which qmake
-```
-
-...you should get the following output:
-```
-/usr/local/bin/qmake
-```
-
 Install redis  (follow the post-install instructions)
 
 ```

diff --git a/circle.yml b/circle.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     working_directory: ~/technovation-girls
     docker:
-      - image: circleci/ruby:2.7.4-node-browsers
+      - image: circleci/ruby:2.7.4-bullseye-node-browsers
         auth:
           username: technovationdocker
           password: $DOCKERHUB_PASSWORD
@@ -102,37 +102,35 @@ jobs:
           REDIS_URL: redis://127.0.0.1:6379/0
           THUNKABLE_PROMO_IMAGE: n-a
           WKHTMLTOPDF_PATH: /usr/local/bin/wkhtmltopdf
-      - image: circleci/postgres:11-alpine-ram
+      - image: circleci/postgres:13-ram
         auth:
           username: technovationdocker
           password: $DOCKERHUB_PASSWORD
+        environment:
+          POSTGRES_PASSWORD: $POSTGRES_PASSWORD
 
     steps:
       - checkout
 
       - restore_cache:
           name: Restore cached gems
           keys:
-            - v1-gem-cache-{{ checksum "Gemfile.lock" }}
-            - v1-gem-cache-
+            - v2-gem-cache-{{ checksum "Gemfile.lock" }}
+            - v2-gem-cache-
 
       - restore_cache:
           name: Restore cached node packages
           keys:
             - v1-node-packages-cache-{{ checksum "yarn.lock" }}
             - v1-node-packages-cache-
 
-      - run:
-          name: Install common dependencies
-          command: sudo apt-get update; sudo apt-get install qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
-
       - run:
           name: Install PostgreSQL
-          command: sudo apt-get install postgresql-client-11
+          command: sudo apt update; sudo apt install postgresql-client-13
 
       - run:
           name: Install pdftk
-          command: sudo apt-get install pdftk
+          command: sudo apt install pdftk
 
       - run:
           name: Install wkhtmltopdf
@@ -142,15 +140,15 @@ jobs:
 
       - run:
           name: Install Jest dependencies
-          command: sudo apt-get install libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev build-essential g++
+          command: sudo apt install libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev build-essential g++
 
       - run:
           name: Install gems
           command: gem install bundler:2.2.23 && bundle check --path=vendor/bundle || bundle install --without development --path=vendor/bundle --jobs 4 --retry 3
 
       - save_cache:
           name: Cache gems
-          key: v1-gem-cache-{{ checksum "Gemfile.lock" }}
+          key: v2-gem-cache-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle