Upstream

.docker-files/pg.sh

@@ -1,10 +1,15 @@
 set +x
 
-# Add PostgreSQL to sources list
-curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
+# Set PG_MAJOR if not set, default to 14
+PG_MAJOR=${PG_MAJOR:-14}
 
-# Install PostgreSQL client and libs
+# Update the key and source list to use Bullseye
+curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+
+# Update the package list and install dependencies
 apt-get update -qq && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -yq libpq-dev \
-  postgresql-client-$PG_MAJOR
+  DEBIAN_FRONTEND=noninteractive apt-get install -yq \
+  libpq5 \
+  libpq-dev \
+  postgresql-client-${PG_MAJOR}

.github/workflows/anchore-analysis.yml

@@ -17,8 +17,8 @@ jobs:
       - name: Build the Container image
         run: |
           docker build --build-arg APP_ENV=production \
-               --build-arg RUBY_VERSION=3.2.0 \
-               --build-arg PG_MAJOR=11 \
+               --build-arg RUBY_VERSION=3.3.5 \
+               --build-arg PG_MAJOR=15 \
                --build-arg NODE_MAJOR=16 \
                --build-arg YARN_VERSION=1.13.0 \
                --build-arg BUNDLER_VERSION=2.3.26 \
@@ -29,7 +29,7 @@ jobs:
       - uses: anchore/[email protected]
         id: scan
         with:
-          image: "localbuild/testimage:latest"
+          image: 'localbuild/testimage:latest'
           fail-build: false
           acs-report-enable: true
 

.github/workflows/docker-image-ghcr.yml

@@ -48,8 +48,8 @@ jobs:
           build-args: |
             "APP_ENV=production"
             "NODE_ENV=production"
-            "RUBY_VERSION=3.2.0"
-            "PG_MAJOR=11"
+            "RUBY_VERSION=3.3.5"
+            "PG_MAJOR=15"
             "NODE_MAJOR=16"
             "YARN_VERSION=1.13.0"
             "BUNDLER_VERSION=2.3.26"

.github/workflows/dockerimage.yml

@@ -30,8 +30,8 @@ jobs:
       - name: Build the Docker image
         run: |
           docker build --build-arg APP_ENV=production \
-               --build-arg RUBY_VERSION=3.2.0 \
-               --build-arg PG_MAJOR=11 \
+               --build-arg RUBY_VERSION=3.3.5 \
+               --build-arg PG_MAJOR=15 \
                --build-arg NODE_MAJOR=16 \
                --build-arg YARN_VERSION=1.13.0 \
                --build-arg BUNDLER_VERSION=2.3.26 \

.github/workflows/rubocop-analysis.yml

@@ -1,9 +1,9 @@
 # pulled from repo
-name: "Rubocop"
+name: 'Rubocop'
 
 on:
   push:
-    branches: [ main, master,  '!l10n_master2' ]
+    branches: [main, master, '!l10n_master2']
   schedule:
     - cron: '27 22 * * 2'
 
@@ -14,31 +14,31 @@ jobs:
       fail-fast: false
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # If running on a self-hosted runner, check it meets the requirements
-    # listed at https://github.com/ruby/setup-ruby#using-self-hosted-runners
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.2.0
-
-    # This step is not necessary if you add the gem to your Gemfile
-    # - name: Install Code Scanning integration
-    #   run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
-
-    - name: Install dependencies
-      run: bundle install
-
-    - name: Rubocop run
-      run: |
-        bash -c "
-          bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
-          [[ $? -ne 2 ]]
-        "
-
-    - name: Upload Sarif output
-      uses: github/codeql-action/upload-sarif@v1
-      with:
-        sarif_file: rubocop.sarif
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # If running on a self-hosted runner, check it meets the requirements
+      # listed at https://github.com/ruby/setup-ruby#using-self-hosted-runners
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.5
+
+      # This step is not necessary if you add the gem to your Gemfile
+      # - name: Install Code Scanning integration
+      #   run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Rubocop run
+        run: |
+          bash -c "
+            bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+            [[ $? -ne 2 ]]
+          "
+
+      - name: Upload Sarif output
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: rubocop.sarif

.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       db:
-        image: postgres:11
+        image: postgres:12
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -57,8 +57,11 @@ jobs:
           APPSTORE_DB_URL: postgres://postgres:postgres@localhost:5432/test
 
         run: |
-          bundle exec rails packages:download_and_install["2.0.0-rc"]
-          bundle exec rspec ./spec
+          bundle exec rails packages:download_and_install["2.1.10"]
+          echo "INSTALL NODE"
+          npm install -g ts-node
+          echo "RUN SPECS"
+          bundle exec rspec -fd ./spec
 
       - name: Build and run E2E tests
         env:

.gitignore

@@ -89,3 +89,5 @@ config/credentials/*.yml.enc
 
 /app/assets/builds/*
 !/app/assets/builds/.keep
+
+lib/tasks/wassap.rake

.rubocop_todo.yml

@@ -208,7 +208,7 @@ Metrics/ModuleLength:
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
-  Max: 7
+  Max: 12
 
 # Offense count: 30
 # Configuration parameters: IgnoredMethods.

.ruby-version

@@ -1 +1 @@
-3.2.0
+3.3.5

Dockerfile

@@ -1,5 +1,5 @@
 ARG RUBY_VERSION
-FROM ruby:$RUBY_VERSION-slim-buster
+FROM ruby:$RUBY_VERSION-slim-bullseye
 
 ARG APP_ENV
 
@@ -64,7 +64,11 @@ COPY --chown=docker:docker . /usr/src/app/
 # Clean up temp files and Yarn cache folder
 RUN NODE_OPTIONS="--max-old-space-size=2048" \
     RAILS_ENV=${APP_ENV} \
-    SECRET_KEY_BASE=`bin/rake secret` \
+    AWS_ACCESS_KEY_ID=aa00000 \
+    AWS_SECRET_ACCESS_KEY=aa0000 \
+    AWS_S3_BUCKET=test \
+    AWS_S3_REGION=us-east-1 \
+    SECRET_KEY_BASE=`bin/rails secret` \
     bundle exec rails assets:precompile --trace \
     && rm -rf /usr/src/app/node_modules /usr/src/app/tmp/cache/* /tmp/* \
     && yarn cache clean

Dockerfile.development

@@ -1,5 +1,5 @@
 ARG RUBY_VERSION
-FROM ruby:$RUBY_VERSION-slim-buster
+FROM ruby:$RUBY_VERSION-slim-bullseye
 
 ARG APP_ENV
 

Gemfile

@@ -3,16 +3,17 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.0"
+ruby "3.3.5"
 
 # gem 'google-protobuf', git: 'https://github.com/google/protobuf'
 
-gem "grpc", force_ruby_platform: true
+# gem "grpc", force_ruby_platform: true
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem "anycable-rails"
+
 gem "pg"
-gem "rails", "7.0.5.1" # , github: "rails/rails",
-gem "uri", "0.10.0.1"
+gem "rails", "7.2.1" # , github: "rails/rails",
+gem "uri", "0.10.3"
 
 # Use sqlite3 as the database for Active Record
 # gem "sqlite3", group: "test"
@@ -23,6 +24,7 @@ gem "jsbundling-rails"
 gem "kredis", "~> 1.3"
 gem "propshaft"
 gem "puma", "~> 6.0"
+# gem "falcon"
 gem "sassc"
 gem "tailwindcss-rails"
 
@@ -47,7 +49,7 @@ gem "nightfury", github: "michelson/nightfury" # "~> 1.0"
 gem "action_policy-graphql", "~> 0.4"
 gem "goldiloader"
 gem "graphiql-rails", group: :development
-gem "graphql", "~> 1.13"
+gem "graphql", "~> 2.1"
 
 gem "nokogiri", force_ruby_platform: true
 
@@ -56,7 +58,8 @@ gem "nokogiri", force_ruby_platform: true
 # gem 'tunable'
 gem "aasm"
 gem "acts_as_list", "~> 0.9.19"
-gem "acts-as-taggable-on", github: "mbleigh/acts-as-taggable-on"
+gem "acts-as-taggable-on", github: "mbleigh/acts-as-taggable-on" # branch: "support_rails_7-1"
+# github: "mbleigh/acts-as-taggable-on", branch: "support_rails_7-1"
 gem "deep_cloneable"
 gem "friendly_id", "~> 5.2"
 gem "groupdate"
@@ -88,12 +91,12 @@ gem "oauth", "~> 0.5.5"
 gem "omniauth-oauth2"
 
 gem "image_processing", "~> 1.12"
-gem "sidekiq", "~> 6.5"
+gem "sidekiq" # , "~> 6.5"
 # gem "sidekiq-cron"
 
 gem "emoji_data", github: "chaskiq/emoji_data.rb"
 gem "roadie"
-gem "roadie-rails"
+gem "roadie-rails", github: "frederikspang/roadie-rails", branch: "master"
 gem "urlcrypt"
 
 gem "aws-sdk-rails"
@@ -125,7 +128,8 @@ gem "biz", "~> 1.8"
 # gem "i18n-js"
 gem "i18n-js", "~> 4.0.0.alpha1"
 
-gem "globalize", github: "globalize/globalize"
+# gem "globalize", github: "globalize/globalize", branch: "main"
+gem "globalize", github: "jules-w2/globalize", branch: "main"
 
 # To use Stripe, also include:
 gem "stripe", "~> 6.0"
@@ -146,7 +150,7 @@ end
 group :development do
   # gem "rack-mini-profiler", "~> 2.0"
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem "listen", ">= 3.0.5", "< 3.2"
+  gem "listen" # , ">= 3.0.5", "< 3.2"
   gem "web-console", ">= 3.3.0"
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem "spring"