Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/parallel_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
parallel-test:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
strategy:
fail-fast: ${{ inputs.fail-fast }}
matrix:
Expand Down Expand Up @@ -65,23 +65,25 @@ jobs:
- name: Sync time
run: |
sudo apt-get update
sudo apt-get install -y ntpdate
sudo apt-get install -y ntpsec-ntpdate
sudo ntpdate pool.ntp.org

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 4.0.1
ruby-version: 4.0.9
- uses: actions/cache@v6
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
key: ${{ runner.os }}-ruby-4.0.9-libmysqlclient24-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
${{ runner.os }}-ruby-4.0.9-libmysqlclient24-gems-
- name: Install ImageMagick
run: |
sudo apt-get update
sudo apt-get install -y imagemagick
- name: Install MySQL client
run: sudo apt-get install -y libmysqlclient-dev
- name: Install
env:
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: "default doc job cable storage ujs test db"
BUNDLE_PATH: "vendor/bundle"
Expand All @@ -20,7 +20,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 4.0.1
ruby-version: 4.0.9
bundler-cache: true
- name: Run RuboCop
run: bundle exec rubocop --parallel
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-4.0.1
ruby-4.0.9
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-ruby40:3.1.6
FROM phusion/passenger-ruby40:3.2.2

# Set correct environment variables.
ENV HOME /home/app
Expand All @@ -12,16 +12,14 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

RUN bash -lc 'rvm --default use ruby-4.0.1'

# Update installed APT packages
RUN apt-get update && \
apt-get install -y \
wget \
gnupg \
ca-certificates \
lsb-release \
ntp \
ntpsec \
nano \
tmux \
tzdata \
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ GEM
rdf-rdfxml (~> 3.3)
rdf-turtle (~> 3.3, >= 3.3.1)
thor (~> 1.5)
bootsnap (1.23.0)
msgpack (~> 1.2)
bootsnap (1.26.1)
msgpack (~> 1.5)
brakeman (8.0.4)
racc
builder (3.3.0)
Expand Down
Loading