Merge remote-tracking branch 'origin/main' into issue/3536

Author: andreadavanzo

.editorconfig

@@ -0,0 +1,17 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,scss,rb,erb}]
+charset = utf-8
+indent_style = space
+indent_size = 2

.env.mysql2

@@ -0,0 +1,48 @@
+# DMPRoadmap dotenv file
+
+# Rails log level
+RAILS_LOG_LEVEL=debug
+# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
+RAILS_LOG_TO_STDOUT=true
+# Whether or not Rails will be serving your static assets 
+RAILS_SERVE_STATIC_FILES=false
+# Maximum number of Puma threads
+RAILS_MAX_THREADS=5
+# Maximum number of Puma workers
+WEB_CONCURRENCY=2
+# The port puma will use to host the Rails app
+PORT=3000
+
+# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
+DMPROADMAP_HOST=localhost
+
+# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
+# `which wkhtmltopdf` on linux/osx systems.
+WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf
+
+# Database settings.
+DB_ADAPTER=mysql2
+DB_HOST=localhost
+DB_PORT=3306
+DB_POOL_SIZE=16
+DB_NAME=roadmap
+
+# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will 
+# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
+DRAGONFLY_AWS=false
+AWS_REGION=
+AWS_BUCKET_NAME=
+
+# If you have a Rollbar account and want to redcord errors there, add your token here
+ROLLBAR_ACCESS_TOKEN=
+ROLLBAR_ENV=
+
+# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
+# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your 
+# customized content in ./app/views/branded and `app` is for the core roadmap translations.
+# Include your Translation.io API key for the appropriate domains:
+#    app => TRANSLATION_API_ROADMAP
+#    client => TRANSLATION_API_CLIENT
+# DOMAIN=app
+# TRANSLATION_API_ROADMAP=
+# TRANSLATION_API_CLIENT=

.env.postgresql

@@ -0,0 +1,48 @@
+# DMPRoadmap dotenv file
+
+# Rails log level
+RAILS_LOG_LEVEL=debug
+# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
+RAILS_LOG_TO_STDOUT=true
+# Whether or not Rails will be serving your static assets 
+RAILS_SERVE_STATIC_FILES=false
+# Maximum number of Puma threads
+RAILS_MAX_THREADS=5
+# Maximum number of Puma workers
+WEB_CONCURRENCY=2
+# The port puma will use to host the Rails app
+PORT=3000
+
+# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
+DMPROADMAP_HOST=localhost
+
+# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
+# `which wkhtmltopdf` on linux/osx systems.
+WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf
+
+# Database settings.
+DB_ADAPTER=postgresql
+DB_HOST=localhost
+DB_PORT=5432
+DB_POOL_SIZE=16
+DB_NAME=roadmap
+
+# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will 
+# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
+DRAGONFLY_AWS=false
+AWS_REGION=
+AWS_BUCKET_NAME=
+
+# If you have a Rollbar account and want to redcord errors there, add your token here
+ROLLBAR_ACCESS_TOKEN=
+ROLLBAR_ENV=
+
+# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
+# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your 
+# customized content in ./app/views/branded and `app` is for the core roadmap translations.
+# Include your Translation.io API key for the appropriate domains:
+#    app => TRANSLATION_API_ROADMAP
+#    client => TRANSLATION_API_CLIENT
+DOMAIN=app
+TRANSLATION_API_ROADMAP=
+TRANSLATION_API_CLIENT=

.github/workflows/brakeman.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   brakeman:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/danger.yml

@@ -0,0 +1,32 @@
+name: Danger
+
+on: [push, pull_request]
+
+jobs:
+  danger:
+    runs-on: ubuntu-24.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
+      run: |
+        echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`" >> $GITHUB_ENV
+        echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`" >> $GITHUB_ENV
+
+    # Install Ruby - using the version found in the Gemfile.lock
+    - name: 'Install Ruby'
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ env.RUBY_VERSION }}
+
+    - name: 'Bundle Install'
+      run: |
+        gem install bundler -v ${{ env.BUNDLER_VERSION }}
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3 --without pgsql rollbar aws
+
+    - name: 'Run Danger'
+      env:
+        DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: bundle exec danger

.github/workflows/eslint.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   eslint:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     # Checkout the repo
@@ -15,6 +15,7 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         cache: 'yarn'
+        node-version: 18
 
     # Run yarn install for JS dependencies
     - name: 'Yarn Install'

.github/workflows/mysql.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   mysql:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     # Define environment variables for MySQL and Rails
     env:
@@ -14,7 +14,7 @@ jobs:
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
@@ -23,20 +23,22 @@ jobs:
         bundler-cache: true
 
     # Install Node
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
+        node-version: 18
         cache: 'yarn'
 
     # Copy all of the example configs over
-    - name: 'Setup Default Configuration'
+    - name: 'Setup the application'
       run: |
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
+        cp .env.mysql2 .env
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
-      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+      run: EDITOR="sh -c 'echo \"$(cat config/credentials.yml.mysql2)\" > \$1' --" bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
@@ -52,8 +54,8 @@ jobs:
 
     - name: 'Build out the test database'
       run: |
-        bundle exec rails db:create RAILS_ENV=test
-        bundle exec rails db:schema:load RAILS_ENV=test
+        DISABLE_SPRING=1 bundle exec rails db:create RAILS_ENV=test
+        DISABLE_SPRING=1 bundle exec rails db:schema:load RAILS_ENV=test
 
     - name: 'Run any pending database migrations'
       run: bin/rails db:migrate RAILS_ENV=test

.github/workflows/postgres.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   postgresql:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     services:
       # Postgres installation
@@ -27,20 +27,25 @@ jobs:
     env:
       RAILS_ENV: test
       DATABASE_URL: postgres://postgres:@localhost:5432/roadmap_test
+      DISABLE_SPRING: 1
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 3.3.8
         bundler-cache: true
 
+    ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
+    ## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
+
     # Install Node
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
+        node-version: 18
         cache: 'yarn'
 
     # Install the Postgres developer packages
@@ -49,18 +54,24 @@ jobs:
         sudo apt-get update
         sudo apt-get install libpq-dev
 
+    # Install ImageMagick (for `identify` command)
+    - name: 'Install ImageMagick'
+      run: |
+        sudo apt-get install -y imagemagick
+
     # Copy all of the example configs over
     - name: 'Setup Default Configuration'
       run: |
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
+        cp .env.postgresql .env
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
       run: |
         # generate a default credential file and key
-        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+        EDITOR="sh -c 'echo \"$(cat config/credentials.yml.postgresql)\" > \$1' --" bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
@@ -71,11 +82,23 @@ jobs:
       run: |
         yarn install
 
+    # TEMPORARY WORKAROUND FOR THE FOLLOWING ISSUE: https://github.com/DMPRoadmap/roadmap/issues/3485
+    # Remove this once our tests are compatible with the new version of Chrome
+    # Source: https://github.com/teamcapybara/capybara/issues/2800#issuecomment-2731100953
+    - name: Remove image-bundled Chrome
+      run: sudo apt-get purge google-chrome-stable
+    - name: Setup stable Chrome
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: 128
+        install-chromedriver: true
+        install-dependencies: true
+
     # Initialize the DB
     - name: 'Setup Test DB'
       run: |
-        bundle exec rails db:setup RAILS_ENV=test
-        bundle exec rails db:migrate RAILS_ENV=test
+        bundle exec rails db:setup
+        bundle exec rails db:migrate
 
     # Prebuild the CSS, JS and image assets
     - name: 'Compile Assets'

.github/workflows/rubocop.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   rubocop:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     # Checkout the repo

.gitignore

@@ -112,6 +112,9 @@ yarn-debug.log*
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+/app/assets/builds/*
+!/app/assets/builds/.keep
+!/app/assets/builds/.gitkeep
 
 # Ignore briley AWS cloud9 script to start the application
-cloud9-start.sh
+cloud9-start.sh