From bcca80a2848719a72aad4f2b80691a685b46d685 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 09:17:25 -0600 Subject: [PATCH 1/7] Remove qt5 dependencies Our CircleCI image was changed from Buster to Bullseye. The qt5-default package doesn't exist in Bullseye and is therefore breaking the build. I don't think we need this package, from what I can tell, it's used for capybara-webkit, which we're no longer using and is no longer being maintained; so I'm removing this dependency! https://github.com/thoughtbot/capybara-webkit https://github.com/Iridescent-CM/technovation-app/commit/d7cd3a815dbeeba10bf090282e5886a236ce4da3#diff-21b1fe66043572c76c549a4fc5f186e9a69c330b186fc91116b9b70a4d047902 Refs: #3028 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index cf8a2966ff..34b28abf2c 100644 --- a/circle.yml +++ b/circle.yml @@ -124,7 +124,7 @@ jobs: - 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 + command: sudo apt-get update; sudo apt-get install gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x - run: name: Install PostgreSQL From 03d1fbe8455ec37bfe265f66a9137b318f2473e2 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 12:51:22 -0600 Subject: [PATCH 2/7] Update CircleCI's version of PostgreSQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our CircleCI image changed from Buster to Bullseye, and it looks like Bullseye doesn't have version 11, but instead has version 13. 👍 Refs: #3028 --- circle.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 34b28abf2c..89ca845590 100644 --- a/circle.yml +++ b/circle.yml @@ -102,10 +102,12 @@ 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 @@ -128,7 +130,7 @@ jobs: - run: name: Install PostgreSQL - command: sudo apt-get install postgresql-client-11 + command: sudo apt-get install postgresql-client-13 - run: name: Install pdftk From 86b24b1ad9ad45834667ee5ca604b0abadfff517 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 12:52:10 -0600 Subject: [PATCH 3/7] Explicitly use Bullseye This was implicitly using Bullseye, just last week it was using Buster. Explicitly setting this will hopefully minimize the unexpected gotchas in the future. Refs: #3028 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 89ca845590..36fe6b1ada 100644 --- 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 From eae3b14682a5f75799d7545db17c56f22d52370b Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 12:55:07 -0600 Subject: [PATCH 4/7] Update cached gems I never really understood why the gems are cached with a version number, well now I do! When updating from Buster to Bullseye the FFI gem broke and needed to be recompiled, bumping the version number triggered the recompile. Refs: #3028 --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 36fe6b1ada..ec3576f059 100644 --- a/circle.yml +++ b/circle.yml @@ -115,8 +115,8 @@ jobs: - 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 @@ -152,7 +152,7 @@ jobs: - save_cache: name: Cache gems - key: v1-gem-cache-{{ checksum "Gemfile.lock" }} + key: v2-gem-cache-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle From ae9fec00726e2c6b9ad2981a104a87e02d3f1035 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 13:13:56 -0600 Subject: [PATCH 5/7] Remove gstreamer packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to this commit: https://github.com/Iridescent-CM/technovation-app/commit/d7cd3a815dbeeba10bf090282e5886a236ce4da3#diff-21b1fe66043572c76c549a4fc5f186e9a69c330b186fc91116b9b70a4d047902 this was added for capybara-webkit, which we're not using anymore, so I think it's safe to remove these packages. 🤞 Refs: #3028 --- circle.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/circle.yml b/circle.yml index ec3576f059..6da7932625 100644 --- a/circle.yml +++ b/circle.yml @@ -124,10 +124,6 @@ jobs: - 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 gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x - - run: name: Install PostgreSQL command: sudo apt-get install postgresql-client-13 From b86f274532d087d2b4b312b562e1888f06bfbae4 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Tue, 24 Aug 2021 13:18:55 -0600 Subject: [PATCH 6/7] Update apt commands - Add an `apt update` (there was one but I removed it in the previous commit, adding it back here) - Use apt instead of apt-get https://askubuntu.com/questions/445384/what-is-the-difference-between-apt-and-apt-get Refs: #3028 --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 6da7932625..1d44c4153a 100644 --- a/circle.yml +++ b/circle.yml @@ -126,11 +126,11 @@ jobs: - run: name: Install PostgreSQL - command: sudo apt-get install postgresql-client-13 + 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 @@ -140,7 +140,7 @@ 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 From e89192ee8b4fd2f240156b238c0ab2f07d744989 Mon Sep 17 00:00:00 2001 From: shaun <58957909+shaunxp20@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:44:44 -0600 Subject: [PATCH 7/7] Remove qt5 instructions from readme AFIACT, this was used for capybara-webkit, which we're not using anymore, so I'm pretty sure it's safe to remove. Refs: #3028 --- README.md | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/README.md b/README.md index 8e5397f378..43c7695474 100644 --- 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) ```