diff --git a/.github/workflows/tests-next.yml b/.github/workflows/tests-next.yml index 4f653b4b..3a194ffa 100644 --- a/.github/workflows/tests-next.yml +++ b/.github/workflows/tests-next.yml @@ -17,7 +17,7 @@ jobs: services: postgres: - image: postgres:11.6-alpine + image: postgres:16.4-alpine ports: - 5432:5432 env: @@ -29,13 +29,13 @@ jobs: - name: Checkout Code uses: actions/checkout@v1 - - name: Install PostgreSQL 11 client + - name: Install PostgreSQL Client run: | sudo apt-get -yqq install libpq-dev - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.4.10" + ruby-version: "3.4.13" - name: Build App run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 44244801..3a42ecae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: services: postgres: - image: postgres:11.6-alpine + image: postgres:16.4-alpine ports: - 5432:5432 env: @@ -29,13 +29,13 @@ jobs: - name: Checkout Code uses: actions/checkout@v1 - - name: Install PostgreSQL 11 client + - name: Install PostgreSQL Client run: | sudo apt-get -yqq install libpq-dev - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.4.10" + ruby-version: "3.4.13" bundler-cache: true - name: Build App diff --git a/Dockerfile b/Dockerfile index 7382f0b3..86c96188 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM circleci/ruby:3.0.2-node-browsers +FROM cimg/ruby:3.4.13-browsers ARG BUNDLE_GEMFILE=Gemfile diff --git a/Gemfile b/Gemfile index 07e521b3..39707b2b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ def next? File.basename(__FILE__) == "Gemfile.next" end -ruby "3.4.10" +ruby "3.4.13" git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") diff --git a/Gemfile.lock b/Gemfile.lock index c74ad350..c68a4119 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -518,6 +518,7 @@ PLATFORMS arm64-darwin-23 arm64-darwin-24 arm64-darwin-25 + arm64-darwin-27 x86_64-darwin-21 x86_64-darwin-22 x86_64-linux @@ -572,7 +573,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.4.10p104 + ruby 3.4.13p195 BUNDLED WITH 2.4.13 diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 5ffc7337..c01e83ad 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -604,7 +604,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.4.10p104 + ruby 3.4.13p195 BUNDLED WITH 2.6.9 diff --git a/docker-compose.yml b/docker-compose.yml index 3b0f9287..b89093c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: "3.9" - services: db: - image: postgres:10.9-alpine + image: postgres:16.4-alpine environment: POSTGRES_PASSWORD: password POSTGRES_USER: postgres @@ -11,6 +9,7 @@ services: web: &web build: . + platform: linux/amd64 volumes: - ".:/code:delegated" command: bash -c "rm -rf /code/tmp/pids && bundle exec rails s -b 0.0.0.0"