From f9557ede102dcfdd5ed91629adc41096f2cc9728 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Tue, 19 Sep 2023 10:20:00 +0200 Subject: [PATCH 1/2] fix: Add missing queues in Sidekiq --- config/sidekiq.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 6a880214..f09ae618 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,29 +1,34 @@ :concurrency: 5 :queues: + - mailers - default - backups - - metrics - - mailers - - newsletter - events + - newsletter + - exports + - user_report + - block_user - scheduled + - translations + - metrics + - vote_reminder + - reminders :scheduler: :schedule: CalculateAllMetrics: - cron: '0 0 0 * * *' # Run at midnight + cron: '0 9 0 * * *' # Run at 00:09 class: CalculateAllMetricsJob queue: scheduled PreloadOpenData: cron: '0 0 1 * * *' # Run at 01:00 class: PreloadOpenDataJob queue: scheduled - OrdersReminder: - cron: '0 0 18 * * *' # Run at 18:00 - class: OrdersReminderJob + DetectSpamUsers: + cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(6..8) %> * * *' # Run randomly between 06:00 and 08:59 + class: Decidim::SpamDetection::MarkUsersJob queue: scheduled Backup: cron: '0 0 4 * * *' # Run at 04:00 class: BackupJob queue: backups - From 59b641fccf5a646fd7a438b0b7e5c36b11f7d3a3 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:10:19 +0200 Subject: [PATCH 2/2] ci: Use latest chromedriver version --- .github/workflows/ci_cd.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index c3435dbf..41f266ad 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -88,10 +88,6 @@ jobs: key: asset-cache-${{ runner.os }}-${{ steps.cache-hash.outputs.hash }} - run: mkdir -p ./spec/tmp/screenshots name: Create the screenshots folder - # TODO: Use latest version - - uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: "114.0.5735.90" - run: bundle exec rake "test:run[exclude, spec/system/**/*_spec.rb, ${{ matrix.slice }}]" name: RSpec - run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH @@ -156,10 +152,6 @@ jobs: key: asset-cache-${{ runner.os }}-${{ steps.cache-hash.outputs.hash }} - run: mkdir -p ./spec/tmp/screenshots name: Create the screenshots folder - # TODO: Use latest version - - uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: "114.0.5735.90" - run: bundle exec rake "test:run[include, spec/system/**/*_spec.rb, ${{ matrix.slice }}]" name: RSpec - run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH