diff --git a/.github/workflows/start-mysql.sh b/.github/workflows/start-mysql.sh index adbdd308..faf3e44b 100755 --- a/.github/workflows/start-mysql.sh +++ b/.github/workflows/start-mysql.sh @@ -1,18 +1,10 @@ #!/bin/bash set -xe -DOCKER_COMPOSE_VERSION=v2.2.3 - -sudo apt-get update -sudo apt-get install -y netcat-openbsd make gcc - -sudo curl -o /usr/local/bin/docker-compose -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -sudo chmod +x /usr/local/bin/docker-compose - if [ "$MYSQL_VERSION" == "8.0" ]; then - docker-compose -f docker-compose_8.0.yml up -d mysql-1 mysql-2 + docker compose -f docker-compose_8.0.yml up -d mysql-1 mysql-2 else - docker-compose up -d mysql-1 mysql-2 + docker compose up -d mysql-1 mysql-2 fi MAX_ATTEMPTS=60 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0682e232..661cf91a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: Ghostferry MySQL 8.0 tests +name: Ghostferry Tests on: push: @@ -11,14 +11,17 @@ jobs: strategy: matrix: mysql: ["5.7", "8.0"] + runs-on: ubuntu-latest + continue-on-error: true timeout-minutes: 15 + env: CI: "true" MYSQL_VERSION: ${{ matrix.mysql }} + steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 with: go-version: 1.16 @@ -33,14 +36,17 @@ jobs: strategy: matrix: mysql: ["5.7", "8.0"] + runs-on: ubuntu-latest timeout-minutes: 15 + continue-on-error: true + env: CI: "true" MYSQL_VERSION: ${{ matrix.mysql }} + steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 with: go-version: 1.16 @@ -55,18 +61,21 @@ jobs: strategy: matrix: mysql: ["5.7", "8.0"] + runs-on: ubuntu-latest timeout-minutes: 15 + continue-on-error: true + env: CI: "true" BUNDLE_WITHOUT: "development" MYSQL_VERSION: ${{ matrix.mysql }} + steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: 1.16 - - uses: ruby/setup-ruby@v1 with: ruby-version: 3.2 @@ -85,7 +94,6 @@ jobs: runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 with: go-version: 1.16