diff --git a/.github/workflows/specs_mssql_rails61.yml b/.github/workflows/specs_mssql_rails61.yml index 3384d7c..ac268d6 100644 --- a/.github/workflows/specs_mssql_rails61.yml +++ b/.github/workflows/specs_mssql_rails61.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: mssql RAILS_VERSION: 6.1 + RUBY_VERSION: ${{ matrix.ruby }} services: mssql: @@ -25,6 +26,11 @@ jobs: env: ACCEPT_EULA: 'Y' SA_PASSWORD: Pa%%w0rd + options: >- + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -C -Q 'SELECT 1' || /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -Q 'SELECT 1'" + --health-interval 10s + --health-timeout 5s + --health-retries 10 ports: - 1433:1433 diff --git a/.github/workflows/specs_mssql_rails72.yml b/.github/workflows/specs_mssql_rails72.yml index 5f472c0..c19f551 100644 --- a/.github/workflows/specs_mssql_rails72.yml +++ b/.github/workflows/specs_mssql_rails72.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: mssql RAILS_VERSION: 7.2 + RUBY_VERSION: ${{ matrix.ruby }} services: mssql: @@ -25,6 +26,11 @@ jobs: env: ACCEPT_EULA: 'Y' SA_PASSWORD: Pa%%w0rd + options: >- + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -C -Q 'SELECT 1' || /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -Q 'SELECT 1'" + --health-interval 10s + --health-timeout 5s + --health-retries 10 ports: - 1433:1433 diff --git a/.github/workflows/specs_mssql_rails80.yml b/.github/workflows/specs_mssql_rails80.yml index 86a89d0..4f8dd09 100644 --- a/.github/workflows/specs_mssql_rails80.yml +++ b/.github/workflows/specs_mssql_rails80.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: mssql RAILS_VERSION: 8.0 + RUBY_VERSION: ${{ matrix.ruby }} services: mssql: @@ -25,6 +26,11 @@ jobs: env: ACCEPT_EULA: 'Y' SA_PASSWORD: Pa%%w0rd + options: >- + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -C -Q 'SELECT 1' || /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -Q 'SELECT 1'" + --health-interval 10s + --health-timeout 5s + --health-retries 10 ports: - 1433:1433 diff --git a/.github/workflows/specs_mssql_rails81.yml b/.github/workflows/specs_mssql_rails81.yml index fe428e6..c5f659d 100644 --- a/.github/workflows/specs_mssql_rails81.yml +++ b/.github/workflows/specs_mssql_rails81.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: mssql RAILS_VERSION: 8.1 + RUBY_VERSION: ${{ matrix.ruby }} services: mssql: @@ -25,6 +26,11 @@ jobs: env: ACCEPT_EULA: 'Y' SA_PASSWORD: Pa%%w0rd + options: >- + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -C -Q 'SELECT 1' || /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pa%%w0rd' -Q 'SELECT 1'" + --health-interval 10s + --health-timeout 5s + --health-retries 10 ports: - 1433:1433 diff --git a/.github/workflows/specs_mysql_rails61.yml b/.github/workflows/specs_mysql_rails61.yml index b38f2d9..db52ea3 100644 --- a/.github/workflows/specs_mysql_rails61.yml +++ b/.github/workflows/specs_mysql_rails61.yml @@ -18,24 +18,11 @@ jobs: env: DB_TEST: mysql RAILS_VERSION: 6.1 - - services: - mysql: - image: mysql - env: - MYSQL_USER: root - MYSQL_PASSWORD: root - # options: >- - # --health-cmd="mysqladmin ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - ports: - - 3306:3306 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_mysql_rails72.yml b/.github/workflows/specs_mysql_rails72.yml index 6330208..ee82641 100644 --- a/.github/workflows/specs_mysql_rails72.yml +++ b/.github/workflows/specs_mysql_rails72.yml @@ -18,24 +18,11 @@ jobs: env: DB_TEST: mysql RAILS_VERSION: 7.2 - - services: - mysql: - image: mysql - env: - MYSQL_USER: root - MYSQL_PASSWORD: root - # options: >- - # --health-cmd="mysqladmin ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - ports: - - 3306:3306 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_mysql_rails80.yml b/.github/workflows/specs_mysql_rails80.yml index bd1dd00..6913db5 100644 --- a/.github/workflows/specs_mysql_rails80.yml +++ b/.github/workflows/specs_mysql_rails80.yml @@ -18,24 +18,11 @@ jobs: env: DB_TEST: mysql RAILS_VERSION: 8.0 - - services: - mysql: - image: mysql - env: - MYSQL_USER: root - MYSQL_PASSWORD: root - # options: >- - # --health-cmd="mysqladmin ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - ports: - - 3306:3306 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_mysql_rails81.yml b/.github/workflows/specs_mysql_rails81.yml index b25ba0a..dcdbf7d 100644 --- a/.github/workflows/specs_mysql_rails81.yml +++ b/.github/workflows/specs_mysql_rails81.yml @@ -18,24 +18,11 @@ jobs: env: DB_TEST: mysql RAILS_VERSION: 8.1 - - services: - mysql: - image: mysql - env: - MYSQL_USER: root - MYSQL_PASSWORD: root - # options: >- - # --health-cmd="mysqladmin ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - ports: - - 3306:3306 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_postgres_rails61.yml b/.github/workflows/specs_postgres_rails61.yml index 9d152f0..1a9de97 100644 --- a/.github/workflows/specs_postgres_rails61.yml +++ b/.github/workflows/specs_postgres_rails61.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: postgres RAILS_VERSION: 6.1 + RUBY_VERSION: ${{ matrix.ruby }} services: postgres: @@ -35,7 +36,7 @@ jobs: steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_postgres_rails72.yml b/.github/workflows/specs_postgres_rails72.yml index e2e64b6..6b5f3d2 100644 --- a/.github/workflows/specs_postgres_rails72.yml +++ b/.github/workflows/specs_postgres_rails72.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: postgres RAILS_VERSION: 7.2 + RUBY_VERSION: ${{ matrix.ruby }} services: postgres: @@ -35,7 +36,7 @@ jobs: steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_postgres_rails80.yml b/.github/workflows/specs_postgres_rails80.yml index 81d81e2..a6ed693 100644 --- a/.github/workflows/specs_postgres_rails80.yml +++ b/.github/workflows/specs_postgres_rails80.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: postgres RAILS_VERSION: 8.0 + RUBY_VERSION: ${{ matrix.ruby }} services: postgres: @@ -35,7 +36,7 @@ jobs: steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_postgres_rails81.yml b/.github/workflows/specs_postgres_rails81.yml index 94499a9..5c8dc7d 100644 --- a/.github/workflows/specs_postgres_rails81.yml +++ b/.github/workflows/specs_postgres_rails81.yml @@ -18,6 +18,7 @@ jobs: env: DB_TEST: postgres RAILS_VERSION: 8.1 + RUBY_VERSION: ${{ matrix.ruby }} services: postgres: @@ -35,7 +36,7 @@ jobs: steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_sqlite_rails72.yml b/.github/workflows/specs_sqlite_rails72.yml index b334a28..a51b3ee 100644 --- a/.github/workflows/specs_sqlite_rails72.yml +++ b/.github/workflows/specs_sqlite_rails72.yml @@ -18,10 +18,11 @@ jobs: env: DB_TEST: sqlite RAILS_VERSION: 7.2 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_sqlite_rails80.yml b/.github/workflows/specs_sqlite_rails80.yml index f5a80c7..2c8df91 100644 --- a/.github/workflows/specs_sqlite_rails80.yml +++ b/.github/workflows/specs_sqlite_rails80.yml @@ -18,10 +18,11 @@ jobs: env: DB_TEST: sqlite RAILS_VERSION: 8.0 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/specs_sqlite_rails81.yml b/.github/workflows/specs_sqlite_rails81.yml index ff18482..b2031c7 100644 --- a/.github/workflows/specs_sqlite_rails81.yml +++ b/.github/workflows/specs_sqlite_rails81.yml @@ -18,10 +18,11 @@ jobs: env: DB_TEST: sqlite RAILS_VERSION: 8.1 + RUBY_VERSION: ${{ matrix.ruby }} steps: - name: Install dependencies - run: sudo apt-get update -qq && sudo apt-get install -yqq freetds-dev freetds-bin libvips-dev + run: sudo apt-get update -qq && sudo apt-get install -yqq libvips-dev - name: Checkout repository uses: actions/checkout@v4