Skip to content

Commit

Permalink
Release OpenProject 14.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverguenther committed May 22, 2024
2 parents 462d76a + 4c1ff89 commit 4e5f609
Show file tree
Hide file tree
Showing 1,814 changed files with 42,501 additions and 26,829 deletions.
20 changes: 14 additions & 6 deletions .github/workflows/create-merge-release-into-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- id: find_latest_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
run: |
BRANCH=$(curl -H "Authorization: token $GITHUB_TOKEN" \
Expand Down Expand Up @@ -79,11 +79,19 @@ jobs:
echo "Successfully merged $RELEASE_BRANCH into $BASE_BRANCH and pushed"
else
# Close all previous PRs with label
for pr_number in $(gh pr list --label create-merge-release-into-dev-pr --json number --jq='.[].number'); do
gh pr close "$pr_number"
pr_numbers=$(gh pr list --label create-merge-release-into-dev-pr --json number --jq='.[].number')
for pr_number in $pr_numbers; do
gh pr close "$pr_number" --delete-branch
done
TEMP_BRANCH="$RELEASE_BRANCH-$(date "+%Y%m%d%H%M%S")"
pr_body=$(
echo 'Created by GitHub action'
for pr_number in $pr_numbers; do
echo "Replaces #$pr_number"
done
)
TEMP_BRANCH="merge-$RELEASE_BRANCH-$(date "+%Y%m%d%H%M%S")"
git branch "$TEMP_BRANCH" "$RELEASE_BRANCH"
Expand All @@ -93,10 +101,10 @@ jobs:
--base "$BASE_BRANCH" \
--head "$TEMP_BRANCH" \
--title "Merge $RELEASE_BRANCH into $BASE_BRANCH" \
--body 'Created by GitHub action' \
--body "$pr_body" \
--label create-merge-release-into-dev-pr
echo "Created a PR to merge $RELEASE_BRANCH ($TEMP_BRANCH) into $BASE_BRANCH"
fi
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2.3'
ruby-version: '3.3.1'
- uses: MeilCli/danger-action@v5
with:
danger_file: 'Dangerfile'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
uses: runs-on/cache@v4
with:
path: cache/bundle
key: gem-${{ hashFiles('Gemfile.lock') }}
key: gem-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
restore-keys: |
gem-
gem-${{ hashFiles('.ruby-version') }}-
- name: Cache NPM
uses: runs-on/cache@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require:
- rubocop-rails
- rubocop-rspec
- rubocop-rspec_rails
- ./lib_static/rubocop/cop/open_project/add_preview_for_view_component.rb
- ./lib_static/rubocop/cop/open_project/no_do_end_block_with_rspec_capybara_matcher_in_expect.rb
- ./lib_static/rubocop/cop/open_project/use_service_result_factory_methods.rb
Expand All @@ -21,7 +22,7 @@ inherit_mode:
- Exclude

AllCops:
TargetRubyVersion: 3.2
TargetRubyVersion: 3.3
# Enable any new cops in new versions by default
NewCops: enable
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.3.1
19 changes: 11 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gem "doorkeeper", "~> 5.6.6"
# Maintain our own omniauth due to relative URL root issues
# see upstream PR: https://github.com/omniauth/omniauth/pull/903
gem "omniauth", git: "https://github.com/opf/omniauth", ref: "fe862f986b2e846e291784d2caa3d90a658c67f0"
gem "request_store", "~> 1.6.0"
gem "request_store", "~> 1.7.0"

gem "warden", "~> 1.2"
gem "warden-basic_auth", "~> 0.2.1"
Expand Down Expand Up @@ -115,6 +115,8 @@ gem "ruby-duration", "~> 3.2.0"
# released.
gem "mail", "= 2.8.1"

gem "csv", "~> 3.3"

# provide compatible filesystem information for available storage
gem "sys-filesystem", "~> 1.4.0", require: false

Expand All @@ -138,7 +140,7 @@ gem "rack-attack", "~> 6.7.0"
gem "secure_headers", "~> 6.5.0"

# Browser detection for incompatibility checks
gem "browser", "~> 5.3.0"
gem "browser", "~> 6.0.0"

# Providing health checks
gem "okcomputer", "~> 1.18.1"
Expand All @@ -157,10 +159,11 @@ gem "airbrake", "~> 13.0.0", require: false

gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8f14736a88ad0064d2a97be108fe7061ffbcee91"
gem "prawn", "~> 2.4"
gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
# prawn implicitly depends on matrix gem no longer in ruby core with 3.1
gem "matrix", "~> 0.4.2"

gem "meta-tags", "~> 2.20.0"
gem "meta-tags", "~> 2.21.0"

gem "paper_trail", "~> 15.1.0"

Expand All @@ -170,7 +173,7 @@ group :production do
# we use dalli as standard memcache client
# requires memcached 1.4+
gem "dalli", "~> 3.2.0"
gem "redis", "~> 5.1.0"
gem "redis", "~> 5.2.0"
end

gem "i18n-js", "~> 4.2.3"
Expand All @@ -185,7 +188,7 @@ gem "rack-timeout", "~> 0.6.3", require: "rack/timeout/base"

gem "nokogiri", "~> 1.16.0"

gem "carrierwave", "~> 1.3.1"
gem "carrierwave", "~> 1.3.4"
gem "carrierwave_direct", "~> 2.1.0"
gem "fog-aws"

Expand Down Expand Up @@ -214,7 +217,7 @@ gem "appsignal", "~> 3.0", require: false

gem "view_component"
# Lookbook
gem "lookbook", "~> 2.2.1"
gem "lookbook", "~> 2.3.0"

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

gem "fuubar", "~> 2.5.0"
gem "timecop", "~> 0.9.0"
Expand Down Expand Up @@ -383,4 +386,4 @@ end

gem "openproject-octicons", "~>19.10.0"
gem "openproject-octicons_helper", "~>19.10.0"
gem "openproject-primer_view_components", "~>0.28.1"
gem "openproject-primer_view_components", "~>0.29.1"
Loading

0 comments on commit 4e5f609

Please sign in to comment.