Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[D-358] assignable_values - Switch to Ubuntu 24.04 image #52

Merged
merged 4 commits into from
Feb 27, 2025
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
67 changes: 35 additions & 32 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
---
name: Tests
'on':

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
test_mysql:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
mysql:
image: mysql:5.7
Expand All @@ -22,50 +25,57 @@ jobs:
--health-interval=10s
--health-timeout=5s
--health-retries=3

strategy:
fail-fast: false
matrix:
include:
- ruby: 2.5.3
gemfile: Gemfile.5.0
- ruby: 2.5.3
gemfile: Gemfile.5.1
- ruby: 2.7.3
gemfile: Gemfile.6.1.mysql2
- ruby: 2.7.3
gemfile: Gemfile.7.1.mysql2
- ruby: 3.3.0
gemfile: Gemfile.6.1.mysql2
- ruby: 3.3.0
gemfile: Gemfile.7.1.mysql2

env:
BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
- name: Bundle
run: |
gem install bundler:2.1.4
bundle install --no-deployment
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Setup databases
run: |
mysql -e 'create database IF NOT EXISTS assignable_values_test;' -u root --password=password -P 3306 -h 127.0.0.1
- name: Run tests
run: bundle exec rspec

test_pg:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
image: postgres
env:
POSTGRES_PASSWORD: postgres
options: "--health-cmd pg_isready --health-interval 10s --health-timeout 5s
--health-retries 5"
POSTGRES_DB: assignable_values_test
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432

strategy:
fail-fast: false
matrix:
include:
- ruby: 2.5.3
gemfile: Gemfile.5.1.pg
- ruby: 2.5.3
gemfile: Gemfile.6.1.pg
- ruby: 2.7.3
gemfile: Gemfile.6.1.pg
- ruby: 2.7.3
Expand All @@ -78,21 +88,14 @@ jobs:
gemfile: Gemfile.8.0.pg

env:
BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
- name: Setup database
run: |
sudo apt-get update
sudo apt-get install -y postgresql-client
PGPASSWORD=postgres psql -c 'create database assignable_values_test;' -U postgres -p 5432 -h localhost
- name: Bundle
run: |
gem install bundler:2.1.4
bundle install --no-deployment
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rspec
68 changes: 0 additions & 68 deletions Gemfile.5.0.lock

This file was deleted.

68 changes: 0 additions & 68 deletions Gemfile.5.1.lock

This file was deleted.

16 changes: 0 additions & 16 deletions Gemfile.5.1.pg

This file was deleted.

68 changes: 0 additions & 68 deletions Gemfile.5.1.pg.lock

This file was deleted.

4 changes: 2 additions & 2 deletions Gemfile.5.0 → Gemfile.6.1.mysql2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# Runtime dependencies
gem 'activerecord', '~>5.0.0'
gem 'activerecord', '~>6.1.3'
gem 'i18n'
gem 'mysql2'

Expand All @@ -10,7 +10,7 @@ gem 'rake'
gem 'database_cleaner'
gem 'rspec'
gem 'rspec_candy'
gem 'gemika'
gem 'gemika', '~> 0.8.0'

# Gem under test
gem 'assignable_values', :path => '.'
Loading