Merge branch 'develop'

codidact · Feb 14, 2025 · e2c5d96 · e2c5d96
2 parents 7bcf244 + 313eed9
commit e2c5d96
Show file tree

Hide file tree

Showing 333 changed files with 8,258 additions and 1,856 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,13 +1,12 @@
 version: 2.1
 jobs:
-  test:
+  test-ruby27:
     docker:
       - image: cimg/ruby:2.7-node
       - image: cimg/mysql:8.0
         command: [--default-authentication-plugin=mysql_native_password]
         environment:
           MYSQL_ROOT_HOST: '%'
-          MYSQL_USER: 'root'
           MYSQL_ROOT_PASSWORD: 'root'
           MYSQL_DATABASE: 'qpixel_test'
       - image: cimg/redis:7.0
@@ -23,21 +22,157 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - qpixel-{{ checksum "Gemfile" }}
-            - qpixel-
+            - qpixel-ruby27-{{ checksum "Gemfile.lock" }}
+            - qpixel-ruby27-
       - run:
           name: Install Bundler & gems
           command: |
             gem install bundler
             bundle install --path=~/gems
+      - run:
+          name: Clean unnecessary gems
+          command: |
+            bundle clean --force
+      - save_cache:
+          key: qpixel-ruby27-{{ checksum "Gemfile.lock" }}
+          paths:
+            - ~/gems
+      - run:
+          name: Copy key
+          command: |
+            if [ -z "$MASTER_KEY" ]; then rm config/credentials.yml.enc; else echo "$MASTER_KEY" > config/master.key; fi
+      - run:
+          name: Prepare config & database
+          environment:
+            RAILS_ENV: test
+          command: |
+            cp config/database.sample.yml config/database.yml
+            cp config/storage.sample.yml config/storage.yml
+            bundle exec rails db:create
+            bundle exec rails db:schema:load
+            bundle exec rails db:migrate
+            bundle exec rails test:prepare
+      - run:
+          name: Current revision
+          command: |
+            git rev-parse $(git rev-parse --abbrev-ref HEAD)
+      - run:
+          name: Coveralls token
+          command: |
+            if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo "Skipping coveralls"; else echo "repo_token: $COVERALLS_REPO_TOKEN" > .coveralls.yml; fi
+      - run:
+          name: Test
+          command: |
+            bundle exec rails test
+      - store_test_results:
+          path: "~/qpixel/test/reports"
+  system-test-ruby27:
+    docker:
+      - image: cimg/ruby:2.7-browsers
+      - image: cimg/mysql:8.0
+        command: [--default-authentication-plugin=mysql_native_password]
+        environment:
+          MYSQL_ROOT_HOST: '%'
+          MYSQL_ROOT_PASSWORD: 'root'
+          MYSQL_DATABASE: 'qpixel_test'
+      - image: cimg/redis:7.0
+
+    working_directory: ~/qpixel
+
+    steps:
+      - run:
+          name: Install packages
+          command: |
+            sudo apt-get --allow-releaseinfo-change -qq update
+            sudo apt-get -y install git libmariadb-dev libmagickwand-dev
+      - checkout
+      - restore_cache:
+          keys:
+            - qpixel-ruby27-{{ checksum "Gemfile.lock" }}
+            - qpixel-ruby27-
+      - run:
+          name: Install Bundler & gems
+          command: |
+            gem install bundler
+            bundle install --path=~/gems
+      - run:
+          name: Clean unnecessary gems
+          command: |
+            bundle clean --force
+      - save_cache:
+          key: qpixel-ruby27-{{ checksum "Gemfile.lock" }}
+          paths:
+            - ~/gems
+      - run:
+          name: Copy key
+          command: |
+            if [ -z "$MASTER_KEY" ]; then rm config/credentials.yml.enc; else echo "$MASTER_KEY" > config/master.key; fi
+      - run:
+          name: Prepare config & database
+          environment:
+            RAILS_ENV: test
+          command: |
+            cp config/database.sample.yml config/database.yml
+            cp config/storage.sample.yml config/storage.yml
+            bundle exec rails db:create
+            bundle exec rails db:schema:load
+            bundle exec rails db:migrate
+            bundle exec rails test:prepare
+      - run:
+          name: Current revision
+          command: |
+            git rev-parse $(git rev-parse --abbrev-ref HEAD)
+      - run:
+          name: Test
+          command: |
+            bundle exec rails test:system
+      - store_test_results:
+          path: "~/qpixel/test/reports"
+      - store_artifacts:
+          path: "~/qpixel/tmp/screenshots"
+          when: on_fail
+
+  test-ruby31:
+    docker:
+      - image: cimg/ruby:3.1-node
+      - image: cimg/mysql:8.0
+        command: [ --default-authentication-plugin=mysql_native_password ]
+        environment:
+          MYSQL_ROOT_HOST: '%'
+          MYSQL_ROOT_PASSWORD: 'root'
+          MYSQL_DATABASE: 'qpixel_test'
+      - image: cimg/redis:7.0
+
+    working_directory: ~/qpixel
+
+    steps:
+      - run:
+          name: Install packages
+          command: |
+            sudo apt-get --allow-releaseinfo-change -qq update
+            sudo apt-get -y install git libmariadb-dev libmagickwand-dev
+      - checkout
+      - restore_cache:
+          keys:
+            - qpixel-ruby31-{{ checksum "Gemfile.lock" }}
+            - qpixel-ruby31-
+      - run:
+          name: Install Bundler & gems
+          command: |
+            gem install bundler
+            bundle install --path=~/gems
+      - run:
+          name: Clean unnecessary gems
+          command: |
+            bundle clean --force
       - save_cache:
-          key: qpixel-{{ checksum "Gemfile" }}
+          key: qpixel-ruby31-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/gems
       - run:
           name: Copy key
           command: |
-            echo "$MASTER_KEY" > config/master.key
+            if [ -z "$MASTER_KEY" ]; then rm config/credentials.yml.enc; else echo "$MASTER_KEY" > config/master.key; fi
       - run:
           name: Prepare config & database
           environment:
@@ -56,17 +191,82 @@ jobs:
       - run:
           name: Coveralls token
           command: |
-            echo "repo_token: $COVERALLS_REPO_TOKEN" > .coveralls.yml
+            if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo "Skipping coveralls"; else echo "repo_token: $COVERALLS_REPO_TOKEN" > .coveralls.yml; fi
       - run:
           name: Test
           command: |
             bundle exec rails test
       - store_test_results:
           path: "~/qpixel/test/reports"
+  system-test-ruby31:
+    docker:
+      - image: cimg/ruby:3.1-browsers
+      - image: cimg/mysql:8.0
+        command: [ --default-authentication-plugin=mysql_native_password ]
+        environment:
+          MYSQL_ROOT_HOST: '%'
+          MYSQL_ROOT_PASSWORD: 'root'
+          MYSQL_DATABASE: 'qpixel_test'
+      - image: cimg/redis:7.0
+
+    working_directory: ~/qpixel
+
+    steps:
+      - run:
+          name: Install packages
+          command: |
+            sudo apt-get --allow-releaseinfo-change -qq update
+            sudo apt-get -y install git libmariadb-dev libmagickwand-dev
+      - checkout
+      - restore_cache:
+          keys:
+            - qpixel-ruby31-{{ checksum "Gemfile.lock" }}
+            - qpixel-ruby31-
+      - run:
+          name: Install Bundler & gems
+          command: |
+            gem install bundler
+            bundle install --path=~/gems
+      - run:
+          name: Clean unnecessary gems
+          command: |
+            bundle clean --force
+      - save_cache:
+          key: qpixel-ruby31-{{ checksum "Gemfile.lock" }}
+          paths:
+            - ~/gems
+      - run:
+          name: Copy key
+          command: |
+            if [ -z "$MASTER_KEY" ]; then rm config/credentials.yml.enc; else echo "$MASTER_KEY" > config/master.key; fi
+      - run:
+          name: Prepare config & database
+          environment:
+            RAILS_ENV: test
+          command: |
+            cp config/database.sample.yml config/database.yml
+            cp config/storage.sample.yml config/storage.yml
+            bundle exec rails db:create
+            bundle exec rails db:schema:load
+            bundle exec rails db:migrate
+            bundle exec rails test:prepare
+      - run:
+          name: Current revision
+          command: |
+            git rev-parse $(git rev-parse --abbrev-ref HEAD)
+      - run:
+          name: Test
+          command: |
+            bundle exec rails test:system
+      - store_test_results:
+          path: "~/qpixel/test/reports"
+      - store_artifacts:
+          path: "~/qpixel/tmp/screenshots"
+          when: on_fail
 
   rubocop:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.1-node
 
     working_directory: ~/qpixel
 
@@ -79,15 +279,19 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - qpixel-{{ checksum "Gemfile" }}
-            - qpixel-
+            - qpixel-ruby31-{{ checksum "Gemfile.lock" }}
+            - qpixel-ruby31-
       - run:
           name: Install Bundler & gems
           command: |
             gem install bundler
             bundle install --path=~/gems
+      - run:
+          name: Clean unnecessary gems
+          command: |
+            bundle clean --force
       - save_cache:
-          key: qpixel-{{ checksum "Gemfile" }}
+          key: qpixel-ruby31-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/gems
       - run:
@@ -97,7 +301,7 @@ jobs:
 
   deploy:
     docker:
-      - image: cimg/ruby:2.7-node
+      - image: cimg/ruby:3.1-node
 
     working_directory: ~/qpixel
 
@@ -115,11 +319,17 @@ jobs:
 workflows:
   test_lint:
     jobs:
-      - test
+      - test-ruby27
+      - test-ruby31
+      - system-test-ruby27
+      - system-test-ruby31
       - rubocop
       - deploy:
           requires:
-            - test
+            - test-ruby27
+            - test-ruby31
+            - system-test-ruby27
+            - system-test-ruby31
             - rubocop
           filters:
             branches:

diff --git a/.github/ISSUE_TEMPLATE/bug-feature-via-meta.md b/.github/ISSUE_TEMPLATE/bug-feature-via-meta.md
@@ -0,0 +1,16 @@
+---
+name: Bug/Feature via Meta
+about: Use when you're copying a bug/feature request here from Meta.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Meta posts are autolinked. Insert the post ID after meta: and a link will be generated for you. -->
+meta:123
+
+<!-- Provide a brief description of what the bug/feature is based on the Meta post. -->
+
+
+<!-- Add any discussion that's been had around the issue, either on Meta, Discord, or elsewhere. Include any suggested resolutions or suggestions for how we could address this. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here. Include device/browser/OS information if it's relevant.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.