Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajhodgson
ajhodgson committed Jun 21, 2023
2 parents f5f860f + a46604b commit c9a1424
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ jobs:
run: make build_customizable

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_customizable

build-ruby27:
Expand All @@ -52,13 +54,15 @@ jobs:
run: make build_ruby27

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_ruby27

build-ruby30:
Expand All @@ -77,13 +81,15 @@ jobs:
run: make build_ruby30

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_ruby30

build-ruby31:
Expand All @@ -102,13 +108,15 @@ jobs:
run: make build_ruby31

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_ruby31

build-ruby32:
Expand All @@ -127,13 +135,15 @@ jobs:
run: make build_ruby32

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_ruby32

build-jruby93:
Expand All @@ -152,13 +162,15 @@ jobs:
run: make build_jruby93

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_jruby93

build-jruby94:
Expand All @@ -177,13 +189,15 @@ jobs:
run: make build_jruby94

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_jruby94

build-nodejs:
Expand All @@ -202,13 +216,15 @@ jobs:
run: make build_nodejs

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_nodejs

build-full:
Expand All @@ -227,11 +243,13 @@ jobs:
run: make build_full

- name: Log in to the Container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to github container registry
if: ${{ github.event.pull_request.merged && github.ref == 'refs/heads/master' }}
run: make release_full
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## not released
* Compile all CRuby versions from source to ensure uniformity and YJIT capability in versions 3.1+
* Use Ruby 3.2.x by default
* Upgraded to JRuby 9.3.10.0
* Upgraded to JRuby 9.4.3.0

## 2.5.1 (release date: 2023-06-14)
* Upgraded to Phusion Passenger 6.0.18 (from 6.0.17).
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock

Language support:

* Ruby 2.7.8, 3.0.6, 3.1.4, 3.2.2 and JRuby 9.3.9.0 and 9.4.0.0.
* Ruby 2.7.8, 3.0.6, 3.1.4, 3.2.2 and JRuby 9.3.10.0 and 9.4.3.0.
* RVM is used to manage Ruby versions. [Why RVM?](#why_rvm)
* 3.2.2 is configured as the default.
* JRuby is installed from source, but we register an APT entry for it.
Expand Down Expand Up @@ -438,10 +438,10 @@ RUN bash -lc 'rvm --default use ruby-3.0.6'
RUN bash -lc 'rvm --default use ruby-3.1.4'
# Ruby 3.2.2
RUN bash -lc 'rvm --default use ruby-3.2.2'
# JRuby 9.3.9.0
RUN bash -lc 'rvm --default use jruby-9.3.9.0'
# JRuby 9.4.0.0
RUN bash -lc 'rvm --default use jruby-9.4.0.0'
# JRuby 9.3.10.0
RUN bash -lc 'rvm --default use jruby-9.3.10.0'
# JRuby 9.4.3.0
RUN bash -lc 'rvm --default use jruby-9.4.3.0'
```

Learn more: [RVM: Setting the default Ruby](https://rvm.io/rubies/default).
Expand Down
0 image/jruby-9.3.9.0.sh → image/jruby-9.3.10.0.sh
View file
File renamed without changes.
0 image/jruby-9.4.0.0.sh → image/jruby-9.4.3.0.sh
View file
File renamed without changes.

0 comments on commit c9a1424

Please sign in to comment.