From b65eed2c129f5edc0cc45961c30f408d5eb3dfa5 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Wed, 3 Jun 2026 16:09:59 +0200 Subject: [PATCH 1/5] Update GitHub Actions Related to https://trello.com/c/fVjmPKGe/4603-sprint197-uppgradera-github-actions-till-node-24 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd7ce98..ab3d22a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Setup Ruby ${{ matrix.ruby }} uses: ruby/setup-ruby@v1 From 2122fb97df77e8eec87e158780060f651d29f2e7 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Wed, 3 Jun 2026 16:29:52 +0200 Subject: [PATCH 2/5] Use Docker compose for dependencies in GitHub Actions --- .github/workflows/ci.yml | 15 +++------------ docker-compose.yml | 5 +++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab3d22a..114b002 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,18 +8,6 @@ jobs: build: runs-on: ubuntu-22.04 - services: - rabbitmq: - image: rabbitmq:3.10 - # needed because the rabbitmq container does not provide a healthcheck - options: >- - --health-cmd "rabbitmq-diagnostics ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - - 5672:5672 - strategy: fail-fast: false matrix: @@ -39,6 +27,9 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true + - name: Run docker compose + run: docker compose up -d --wait --wait-timeout 30 + - name: Run tests run: bundle exec rake continue-on-error: ${{ matrix.allow-failure || false }} diff --git a/docker-compose.yml b/docker-compose.yml index 7cb578f..ea1b65d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,3 +5,8 @@ services: image: rabbitmq:3.10 ports: - 5672:5672 + healthcheck: + test: ["CMD", "rabbitmq-diagnostics", "ping"] + interval: 10s + timeout: 5s + retries: 5 From 051d2a3c55cf370f1b3a4eb62dc1f8ed4d2137d0 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Wed, 3 Jun 2026 16:31:26 +0200 Subject: [PATCH 3/5] Update RabbitMQ to 4.2 in Docker Compose file --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea1b65d..2447827 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: rabbitmq: - image: rabbitmq:3.10 + image: rabbitmq:4.2 ports: - 5672:5672 healthcheck: From 1eb3df0a3ac9e8e4c8cf0e82d5cc1fe5e8fdc721 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Wed, 3 Jun 2026 16:44:01 +0200 Subject: [PATCH 4/5] Test with some more modern Ruby versions The tests fails with Ruby 4.0, so I didn't add that version. Instead I kept 3.2, even though it's EOL. This is at least better than keeping what we had before. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 114b002..30776c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,9 @@ jobs: fail-fast: false matrix: include: - - { ruby: 2.7.6 } - - { ruby: 3.0.4 } - - { ruby: 3.1.2 } + - { ruby: 3.2 } + - { ruby: 3.3 } + - { ruby: 3.4 } - { ruby: jruby-9.3.7.0, allow-failure: true } steps: From a3443de50931b5f7b0d6f48c2800cec9f2c0a86f Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Wed, 3 Jun 2026 16:44:37 +0200 Subject: [PATCH 5/5] Remove obsolete version from Docker Compose file It's no longer used, see https://docs.docker.com/reference/compose-file/version-and-name/#version-top-level-element-obsolete --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2447827..ff14aa6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: rabbitmq: image: rabbitmq:4.2