Skip to content

Commit 1c99cd6

Browse files
committed
Updates requirements
Signed-off-by: Daniel Kastl <[email protected]>
1 parent a6d9b1a commit 1c99cd6

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

.github/workflows/test-postgis.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,9 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
redmine_version: [4.2-stable, 5.0-stable, master]
28-
ruby_version: ['2.7', '3.0', '3.1']
29-
db_version: [11-2.5, 14-3.2]
30-
exclude:
31-
- redmine_version: 4.2-stable
32-
ruby_version: 3.0
33-
- redmine_version: 4.2-stable
34-
ruby_version: 3.1
27+
redmine_version: [5.0-stable, master]
28+
ruby_version: ['3.0', '3.1']
29+
db_version: [12-3.0, 15-3.3]
3530

3631
services:
3732
postgres:
@@ -92,14 +87,14 @@ jobs:
9287
encoding: utf8
9388
EOF
9489
95-
- name: Adjust Gem environment
96-
run: |
97-
case "${{ matrix.redmine_version }}" in
98-
4.2-stable)
99-
echo "GEM_RGEO_ACTIVERECORD_VERSION=6.2.2" >> ${GITHUB_ENV}
100-
echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=5.2.3" >> ${GITHUB_ENV}
101-
;;
102-
esac
90+
# - name: Adjust Gem environment
91+
# run: |
92+
# case "${{ matrix.redmine_version }}" in
93+
# 4.2-stable)
94+
# echo "GEM_RGEO_ACTIVERECORD_VERSION=6.2.2" >> ${GITHUB_ENV}
95+
# echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=5.2.3" >> ${GITHUB_ENV}
96+
# ;;
97+
# esac
10398

10499
- name: Install Ruby dependencies
105100
working-directory: redmine

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
# Define gem versions with environment variables or default versions
44
gem_versions = {
5-
pg: ENV['GEM_PG_VERSION'] || '1.4.6',
5+
pg: ENV['GEM_PG_VERSION'] || '1.5.3',
66
rgeo: ENV['GEM_RGEO_VERSION'] || '3.0.0',
77
rgeo_activerecord: ENV['GEM_RGEO_ACTIVERECORD_VERSION'] || '7.0.1',
88
activerecord_postgis_adapter: ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] || '7.1.1'

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ or MariaDB/MySQL!!!
1919

2020
- Redmine >= 5.0.0
2121
- PostgreSQL >= 12
22-
- PostGIS >= 2.5
22+
- PostGIS >= 3.0
2323
- NodeJS v18
2424
- yarn
2525

@@ -43,12 +43,17 @@ yarn
4343
npx webpack
4444
```
4545

46+
Optionally export to override the [default GEM version](./Gemfile)
47+
48+
```sh
49+
export GEM_PG_VERSION=your-pg-version
50+
export GEM_RGEO_ACTIVERECORD_VERSION=your-rgeo-activerecord-version
51+
export GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=your-activerecord-postgis-adapter-version
52+
```
53+
4654
Then run
4755

4856
```sh
49-
export GEM_PG_VERSION=your-pg-version # skip this line if redmine use pg 1.2.2.
50-
export GEM_RGEO_ACTIVERECORD_VERSION=your-rgeo-activerecord-version # skip this line if using rgeo-activerecord 6.2.2.
51-
export GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=your-activerecord-postgis-adapter-version # skip this line if using activerecord-postgis-adapter 5.2.3.
5257
bundle install
5358
bundle exec rake redmine:plugins:migrate
5459
```

init.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
author_url 'https://github.com/georepublic'
99
url 'https://github.com/gtt-project/redmine_gtt'
1010
description 'Adds location-based task management and maps'
11-
version '4.3.1'
11+
version '5.0.0'
1212

13-
requires_redmine :version_or_higher => '4.2.0'
13+
requires_redmine :version_or_higher => '5.0.0'
1414

1515
project_module :gtt do
1616
permission :manage_gtt_settings, {

0 commit comments

Comments
 (0)