Skip to content

Commit

Permalink
Merge branch 'dev' into task/48717-replace-delayedjob
Browse files Browse the repository at this point in the history
  • Loading branch information
ba1ash authored Feb 26, 2024
2 parents 8ab39f1 + a786108 commit 227029c
Show file tree
Hide file tree
Showing 468 changed files with 13,520 additions and 5,188 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/brakeman-scan-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ jobs:

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
# FIXME: remove the ruby version once '3.2.2' is released.
# This is set to head to fix ruby segfaulting when brakeman is
# used. See https://bugs.ruby-lang.org/issues/19433
ruby-version: 'head'

- name: Setup Brakeman
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ jobs:
TOKEN: ${{ secrets.OPENPROJECT_CI_TOKEN }}
REPOSITORY: opf/openproject-flavours
WORKFLOW_ID: ci.yml
CORE_REF: ${{ github.ref_name }}
run: |
curl -i --fail-with-body -H"authorization: Bearer $TOKEN" \
-XPOST -H"Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/$REPOSITORY/actions/workflows/$WORKFLOW_ID/dispatches \
-d '{"ref": "dev", "inputs": { "ref" : "'$CORE_REF'" }}'
-d '{"ref": "dev", "inputs": { "ref" : "${{ github.ref_name }}" }}'
26 changes: 26 additions & 0 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: migration-warning-on-release-branches

on:
pull_request:
branches:
- release/*
paths:
- 'db/migrate/**.rb'
- 'modules/**/db/migrate/*.rb'

jobs:
danger:
if: github.repository == 'opf/openproject'
runs-on: [ubuntu-latest]
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2.3'
- uses: MeilCli/danger-action@v5
with:
danger_file: 'Dangerfile'
danger_id: 'danger-pr'
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9 changes: 9 additions & 0 deletions Dangerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CORE_OR_MODULE_MIGRATIONS_REGEX = %r{(modules/.*)?db/migrate/.*\.rb}

def added_or_modified_migrations?
(git.modified_files + git.added_files).grep(CORE_OR_MODULE_MIGRATIONS_REGEX)
end

if added_or_modified_migrations?
warn "This PR has migration-related changes on a release branch. Ping @opf/operations"
end
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ gem 'structured_warnings', '~> 0.4.0'
# don't require by default, instead load on-demand when actually configured
gem 'airbrake', '~> 13.0.0', require: false

gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: '04d22bfa73fbeb549fb1f215a6b9a81cfe820814'
gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: '82c2b5cc25a28fbd62cb05b17d9ba0f68d701109'
gem 'prawn', '~> 2.4'
# prawn implicitly depends on matrix gem no longer in ruby core with 3.1
gem 'matrix', '~> 0.4.2'
Expand All @@ -164,6 +164,8 @@ gem 'meta-tags', '~> 2.20.0'

gem 'paper_trail', '~> 15.1.0'

gem 'clamav-client', github: 'honestica/clamav-client', ref: '29e78ae94307cb34e79ddd29c5da79752239d8b7'

group :production do
# we use dalli as standard memcache client
# requires memcached 1.4+
Expand Down Expand Up @@ -212,7 +214,7 @@ gem 'appsignal', '~> 3.0', require: false

gem 'view_component'
# Lookbook
gem 'lookbook', github: 'ViewComponent/lookbook', ref: '473f86d7e343cd78b74cc293a4de06b9b5e7a3e2'
gem 'lookbook', '~> 2.2.1'

# Require factory_bot for usage with openproject plugins testing
gem 'factory_bot', '~> 6.4.0', require: false
Expand Down Expand Up @@ -262,7 +264,7 @@ group :test do
gem 'capybara-screenshot', '~> 1.0.17'
gem 'cuprite', '~> 0.15.0'
gem 'selenium-devtools'
gem 'selenium-webdriver', '~> 4.17.0'
gem 'selenium-webdriver', '~> 4.18.0'

gem 'fuubar', '~> 2.5.0'
gem 'timecop', '~> 0.9.0'
Expand Down Expand Up @@ -315,9 +317,9 @@ group :development, :test do
gem 'debug'

gem 'pry-byebug', '~> 3.10.0', platforms: [:mri]
gem 'pry-doc'
gem 'pry-rails', '~> 0.3.6'
gem 'pry-rescue', '~> 1.6.0'
gem 'pry-doc'

# ruby linting
gem 'rubocop', require: false
Expand Down Expand Up @@ -381,4 +383,4 @@ end

gem 'openproject-octicons', '~>19.8.0'
gem 'openproject-octicons_helper', '~>19.8.0'
gem 'openproject-primer_view_components', '~>0.20.0'
gem 'openproject-primer_view_components', '~>0.22.2'
Loading

0 comments on commit 227029c

Please sign in to comment.