Skip to content

Commit

Permalink
Merge pull request #3022 from TracksApp/release
Browse files Browse the repository at this point in the history
Release 2.7
  • Loading branch information
ZeiP authored Jun 17, 2024
2 parents 29a8c3d + 1d79436 commit 247caf6
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 106 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ jobs:
ruby: ["3.0", "3.1", "3.2", "3.3"]
db: [sqlite, mysql, postgres]
exclude:
- ruby: "3.1"
db: sqlite
- ruby: "3.1"
db: postgres
- ruby: "3.2"
db: sqlite
- ruby: "3.2"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1
FROM ruby:3.3

# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1
Expand All @@ -8,7 +8,7 @@ WORKDIR /app
RUN touch /etc/app-env

COPY Gemfile* /app/
RUN gem install bundler -v 2.4.22
RUN gem install bundler
RUN bundle install --jobs 4

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-3.3 → Dockerfile-3.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2
FROM ruby:3.1

# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/tracks.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TRACKS_VERSION='2.6.1'
TRACKS_VERSION='2.7'
TRACKS_REVISION_WITH_DATE=`git log --date=format:'%Y-%m-%d' --pretty=format:"%h @ %ad" -1`
TRACKS_REVISION=`git log --pretty=format:"%h" -1`
24 changes: 24 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
See doc/upgrading.md for the upgrade documentation!

## Version 2.7

### Removed features

* Support for Ruby 2.6 and 2.7 were dropped.
* Support for inbound message handling was dropped due to API changes caused by required Ruby on Rails upgrade. If you need this, comment in the issue https://github.com/TracksApp/tracks/issues/2463
* Rubocop is no longer used in the CI due to missing support for Ruby > 2.5.

### Deprecations

* This will be the last release to support Ruby 3.0, which is already end-of-life.

### Bug fixes

* The base version for the Docker image was updated from Ruby 2.7 to Ruby 3.3.
* Lots of dependencies have been updated (including security updates).

### Updated translations

* Spanish (thanks Gallegonovato!)
* Dutch (thanks Ranforingus!)
* Russian (thanks Alexey Svistunov!)
* Turkish (thanks Burak Hüseyin Ekseli!)

## Version 2.6.1

### Deprecations
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.1-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
web:
build:
context: ..
dockerfile: Dockerfile
dockerfile: Dockerfile-3.1
environment:
# These are set in script/ci-build, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
Expand Down
32 changes: 0 additions & 32 deletions test-envs/docker-compose-3.1-postgres.yml

This file was deleted.

17 changes: 0 additions & 17 deletions test-envs/docker-compose-3.1-sqlite.yml

This file was deleted.

32 changes: 0 additions & 32 deletions test-envs/docker-compose-3.2-postgres.yml

This file was deleted.

17 changes: 0 additions & 17 deletions test-envs/docker-compose-3.2-sqlite.yml

This file was deleted.

2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.3-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
web:
build:
context: ..
dockerfile: Dockerfile-3.3
dockerfile: Dockerfile
environment:
# These are set in script/ci-build, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.3-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
web:
build:
context: ..
dockerfile: Dockerfile-3.3
dockerfile: Dockerfile
environment:
# These are set in script/ci-build, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.3-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
web:
build:
context: ..
dockerfile: Dockerfile-3.3
dockerfile: Dockerfile
environment:
# These are set in script/ci-build, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
Expand Down

0 comments on commit 247caf6

Please sign in to comment.