From 78e8fdc9cbbbe74c9652ad78ac98461577038788 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Mon, 8 Jun 2026 10:41:59 +0200 Subject: [PATCH 1/3] Update GitHub Actions Related to https://trello.com/c/fVjmPKGe --- .github/workflows/ci-build-and-install-gem.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build-and-install-gem.yml b/.github/workflows/ci-build-and-install-gem.yml index ac15492..4b0065a 100644 --- a/.github/workflows/ci-build-and-install-gem.yml +++ b/.github/workflows/ci-build-and-install-gem.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Setup Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 916a967..c206ddc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,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 f61ea4fd09a31d97986cd7f612d5304c02b40c91 Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Mon, 8 Jun 2026 10:52:02 +0200 Subject: [PATCH 2/3] Use Docker compose for dependencies in GitHub Actions Similar to what we have done in other repos. --- .github/workflows/ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c206ddc..024f8df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,13 +8,6 @@ jobs: build: runs-on: ubuntu-22.04 - services: - toxiproxy: - image: shopify/toxiproxy - ports: - - 8080:8080 # port for the http_host "toxic" - - 8474:8474 # port for controlling toxiproxy - strategy: fail-fast: false matrix: @@ -34,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 }} From 155a2ae5ba4d4779c6d00bf503efc0f4259faf8e Mon Sep 17 00:00:00 2001 From: Mattias Roback Date: Mon, 8 Jun 2026 10:56:50 +0200 Subject: [PATCH 3/3] 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 82475b1..1510b59 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: toxiproxy: image: shopify/toxiproxy