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
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-and-install-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,14 +19,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Setup Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
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 }}
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

services:
toxiproxy:
image: shopify/toxiproxy
Expand Down
Loading