Skip to content

Commit 390bdcd

Browse files
authored
Merge branch 'dev' into merge-release/16.5-20251008101525
2 parents c6753ca + 6386041 commit 390bdcd

File tree

726 files changed

+15953
-5036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

726 files changed

+15953
-5036
lines changed

.github/workflows/docker-release.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ jobs:
6262
REPOSITORY: opf/helm-charts
6363
WORKFLOW_ID: core_release.yml
6464
run: |
65-
# FIXME: re-enable once workflows are confirmed to be doing the right thing
66-
echo "Would have triggered helm charts release with tag: ${{ needs.compute-inputs.outputs.tag }}"
67-
exit 0
6865
curl -i --fail-with-body -H"authorization: Bearer $TOKEN" \
6966
-XPOST -H"Accept: application/vnd.github.v3+json" \
7067
https://api.github.com/repos/$REPOSITORY/actions/workflows/$WORKFLOW_ID/dispatches \
71-
-d '{"ref": "main", "inputs": { "tag" : "${{ needs.compute-inputs.outputs.tag }}" }}'
68+
-d '{"ref": "main", "inputs": { "tag" : "${{ needs.compute-inputs.outputs.tag }}" }}'

.github/workflows/packager.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Package
2+
on:
3+
push:
4+
branches:
5+
- feature/package-via-github-actions
6+
- dev
7+
- release/*
8+
- stable/*
9+
workflow_dispatch:
10+
11+
jobs:
12+
build:
13+
if: github.repository == 'opf/openproject'
14+
name: ${{ matrix.target }}
15+
runs-on: ubuntu-latest
16+
services:
17+
postgres:
18+
image: postgres:16
19+
env:
20+
POSTGRES_DB: app
21+
POSTGRES_USER: app
22+
POSTGRES_PASSWORD: p4ssw0rd
23+
ports:
24+
- 5432:5432
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
target:
29+
- debian:11
30+
- debian:12
31+
- ubuntu:20.04
32+
- ubuntu:22.04
33+
- el:9
34+
- sles:15
35+
steps:
36+
- uses: actions/checkout@v5
37+
with:
38+
fetch-depth: 0
39+
- name: Setup
40+
id: setup
41+
run: |
42+
VERSION=$(ruby -r ./lib/open_project/version.rb -e "puts OpenProject::VERSION")
43+
echo "version=$VERSION" >> $GITHUB_OUTPUT
44+
- name: Package
45+
uses: pkgr/action/package@main
46+
id: package
47+
with:
48+
target: ${{ matrix.target }}
49+
version: ${{ steps.setup.outputs.version }}
50+
debug: true
51+
env: |
52+
DATABASE_URL=postgres://app:[email protected]:5432/app
53+
- name: Publish
54+
uses: pkgr/action/publish@main
55+
with:
56+
target: ${{ matrix.target }}
57+
token: ${{ secrets.PACKAGER_PUBLISH_TOKEN }}
58+
repository: opf/openproject
59+
channel: ${{ github.ref_name }}
60+
file: ${{ steps.package.outputs.package_path }}

.github/workflows/test-core.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- 'help/**'
1717
- 'packaging/**'
1818
- '.pkgr.yml'
19+
- '.github/workflows/packager.yml'
1920

2021
permissions:
2122
contents: read

.github/workflows/version-check.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: Check work package version
22

33
on:
44
pull_request:
5-
types: [labeled, synchronize, ready_for_review]
5+
types:
6+
- opened
7+
- labeled
8+
- synchronize
9+
- ready_for_review
610

711
permissions:
812
contents: read # to fetch code (actions/checkout)

Gemfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gem "activemodel-serializers-xml", "~> 1.0.1"
3939
gem "activerecord-import", "~> 2.2.0"
4040
gem "activerecord-session_store", "~> 2.2.0"
4141
gem "ox"
42-
gem "rails", "~> 8.0.2", ">= 8.0.2.1"
42+
gem "rails", "~> 8.0.3"
4343
gem "responders", "~> 3.0"
4444

4545
gem "ffi", "~> 1.15"
@@ -82,7 +82,7 @@ gem "htmldiff"
8282
gem "stringex", "~> 2.8.5"
8383

8484
# CommonMark markdown parser with GFM extension
85-
gem "commonmarker", "~> 2.4.0"
85+
gem "commonmarker", "~> 2.4.1"
8686

8787
# HTML pipeline for transformations on text formatter output
8888
# such as sanitization or additional features
@@ -92,7 +92,7 @@ gem "deckar01-task_list", "~> 2.3.1"
9292
# Requires escape-utils for faster escaping
9393
gem "escape_utils", "~> 1.3"
9494
# Syntax highlighting used in html-pipeline with rouge
95-
gem "rouge", "~> 4.6.0"
95+
gem "rouge", "~> 4.6.1"
9696
# HTML sanitization used for html-pipeline
9797
gem "sanitize", "~> 7.0.0"
9898
# HTML autolinking for mails and urls (replaces autolink)
@@ -166,7 +166,7 @@ gem "paper_trail", "~> 16.0.0"
166166
gem "op-clamav-client", "~> 3.4", require: "clamav"
167167

168168
# Global ID for polymorphic associations
169-
gem "globalid", "~> 1.2"
169+
gem "globalid", "~> 1.3"
170170

171171
# Recurring meeting events definition
172172
gem "ice_cube", "~> 0.17.0"
@@ -194,9 +194,9 @@ gem "carrierwave", "~> 1.3.4"
194194
gem "carrierwave_direct", "~> 2.1.0"
195195
gem "fog-aws"
196196

197-
gem "aws-sdk-core", "~> 3.107"
197+
gem "aws-sdk-core", "~> 3.233"
198198
# File upload via fog + screenshots on travis
199-
gem "aws-sdk-s3", "~> 1.91"
199+
gem "aws-sdk-s3", "~> 1.199"
200200

201201
gem "openproject-token", "~> 7.4.0"
202202

@@ -227,7 +227,7 @@ gem "yabeda-rails"
227227

228228
# opentelemetry
229229
gem "opentelemetry-exporter-otlp", "~> 0.30.0", require: false
230-
gem "opentelemetry-instrumentation-all", "~> 0.82.0", require: false
230+
gem "opentelemetry-instrumentation-all", "~> 0.84.0", require: false
231231
gem "opentelemetry-sdk", "~> 1.9", require: false
232232

233233
gem "view_component", "~> 4.0.2"
@@ -240,11 +240,11 @@ gem "factory_bot", "~> 6.5.0", require: false
240240
gem "factory_bot_rails", "~> 6.5.0", require: false
241241

242242
gem "turbo_power", "~> 0.7.0"
243-
gem "turbo-rails", "~> 2.0.0"
243+
gem "turbo-rails", "~> 2.0.17"
244244

245245
# There is a problem with version 1.4.0. Do not update until you're sure there is no infinite hang
246246
# happenning in failing tests when WebMock or VCR stub cannot be found.
247-
gem "httpx", "~> 1.6.1"
247+
gem "httpx", "~> 1.6.2"
248248

249249
# Brings actual deep freezing to most ruby objects
250250
gem "ice_nine"
@@ -284,12 +284,12 @@ group :test do
284284
gem "rails-controller-testing", "~> 1.0.2"
285285

286286
gem "capybara", "~> 3.40.0"
287-
gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", tag: "v0.13.0"
287+
gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", tag: "v0.14.0"
288288
gem "capybara-screenshot", "~> 1.0.17"
289289
gem "cuprite", "~> 0.17.0"
290290
gem "rspec-wait"
291291
gem "selenium-devtools"
292-
gem "selenium-webdriver", "~> 4.20"
292+
gem "selenium-webdriver", "~> 4.36"
293293

294294
gem "fuubar", "~> 2.5.0", require: false
295295
gem "timecop", "~> 0.9.0"
@@ -371,7 +371,7 @@ group :development, :test do
371371
gem "i18n-tasks", "~> 1.0.13", require: false
372372

373373
# Active Record Doctor helps to keep the database in good shape.
374-
gem "active_record_doctor", "~> 1.15.0"
374+
gem "active_record_doctor", "~> 2.0.1"
375375
end
376376

377377
gem "bootsnap", "~> 1.18.0", require: false
@@ -403,7 +403,7 @@ gem "activerecord-nulldb-adapter", "~> 1.1.1"
403403

404404
# Have application level locks on the database to have a mutex shared between workers/hosts.
405405
# We e.g. employ this to safeguard the creation of journals.
406-
gem "with_advisory_lock", "~> 7.0.1"
406+
gem "with_advisory_lock", "~> 7.0.2"
407407

408408
# Load Gemfile.modules explicitly to allow dependabot to work
409409
eval_gemfile "./Gemfile.modules"
@@ -419,4 +419,4 @@ end
419419

420420
gem "openproject-octicons", "~>19.29.0"
421421
gem "openproject-octicons_helper", "~>19.29.0"
422-
gem "openproject-primer_view_components", "~>0.73.1"
422+
gem "openproject-primer_view_components", "~>0.74.1"

0 commit comments

Comments
 (0)