From 3ab0026c2269547152f09f46ad7bec4546fd2fbb Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 11 Feb 2024 23:27:51 +0100 Subject: [PATCH] chore: reduce matrix for now (#97) --- .github/workflows/ci-mysql5.yml | 20 ++++++++++---------- .github/workflows/ci-mysql8.yml | 18 +++++++++--------- .github/workflows/ci-postgresql.yml | 20 +++++++++++--------- .github/workflows/ci-sqlite3.yml | 16 ++++++++-------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci-mysql5.yml b/.github/workflows/ci-mysql5.yml index 869c060..09c494c 100644 --- a/.github/workflows/ci-mysql5.yml +++ b/.github/workflows/ci-mysql5.yml @@ -10,12 +10,12 @@ concurrency: jobs: minitest: runs-on: ubuntu-latest - name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} + name: CI Mysql 5.7 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }} services: mysql: image: mysql/mysql-server:5.7 ports: - - "3306:3306" + - 3306 env: MYSQL_USER: with_advisory MYSQL_PASSWORD: with_advisory_pass @@ -25,10 +25,10 @@ jobs: fail-fast: false matrix: ruby: - - '3.2' - - '3.1' - - '3.0' - - '2.7' +# - '3.2' +# - '3.1' +# - '3.0' +# - '2.7' - '3.3' - 'truffleruby' rails: @@ -36,12 +36,12 @@ jobs: - "7.0" - 6.1 adapter: - - mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test - - trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test + - mysql2 + - trilogy include: - ruby: jruby rails: 6.1 - adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test + adapter: jdbcmysql steps: - name: Checkout uses: actions/checkout@v4 @@ -56,6 +56,6 @@ jobs: - name: Test env: BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile - DATABASE_URL: ${{ matrix.adapter }} + DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bundle exec rake diff --git a/.github/workflows/ci-mysql8.yml b/.github/workflows/ci-mysql8.yml index 32b12d6..e900010 100644 --- a/.github/workflows/ci-mysql8.yml +++ b/.github/workflows/ci-mysql8.yml @@ -11,12 +11,12 @@ concurrency: jobs: minitest: runs-on: ubuntu-latest - name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} + name: CI Mysql 8.0 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }} services: mysql: image: mysql/mysql-server ports: - - "3306:3306" + - 3306 env: MYSQL_USER: with_advisory MYSQL_PASSWORD: with_advisory_pass @@ -26,10 +26,10 @@ jobs: fail-fast: false matrix: ruby: - - '3.2' - - '3.1' - - '3.0' - - '2.7' +# - '3.2' +# - '3.1' +# - '3.0' +# - '2.7' - '3.3' - 'truffleruby' rails: @@ -37,12 +37,12 @@ jobs: - "7.0" - 6.1 adapter: - - mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test + - mysql2 # - trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test Trilogy is not supported by mysql 8 with new encryption include: - ruby: jruby rails: 6.1 - adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test + adapter: jdbcmysql steps: - name: Checkout uses: actions/checkout@v4 @@ -57,6 +57,6 @@ jobs: - name: Test env: BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile - DATABASE_URL: ${{ matrix.adapter }} + DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bundle exec rake diff --git a/.github/workflows/ci-postgresql.yml b/.github/workflows/ci-postgresql.yml index 7622f38..207b6e2 100644 --- a/.github/workflows/ci-postgresql.yml +++ b/.github/workflows/ci-postgresql.yml @@ -10,10 +10,12 @@ concurrency: jobs: minitest: runs-on: ubuntu-latest + name: CI Postgresql Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }} services: postgres: - image: 'postgres:14-alpine' - ports: ['5432:5432'] + image: 'postgres:16-alpine' + ports: + - '5432' env: POSTGRES_USER: with_advisory POSTGRES_PASSWORD: with_advisory_pass @@ -27,10 +29,10 @@ jobs: fail-fast: false matrix: ruby: - - '3.2' - - '3.1' - - '3.0' - - '2.7' +# - '3.2' +# - '3.1' +# - '3.0' +# - '2.7' - '3.3' - 'truffleruby' rails: @@ -38,11 +40,11 @@ jobs: - "7.0" - 6.1 adapter: - - postgres://with_advisory:with_advisory_pass@0/with_advisory_lock_test + - postgres include: - ruby: jruby rails: 6.1 - adapter: jdbcpostgresql://with_advisory:with_advisory_pass@0/with_advisory_lock_test + adapter: jdbcpostgresql steps: - name: Checkout uses: actions/checkout@v4 @@ -57,6 +59,6 @@ jobs: - name: Test env: BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile - DATABASE_URL: ${{ matrix.adapter }} + DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bundle exec rake diff --git a/.github/workflows/ci-sqlite3.yml b/.github/workflows/ci-sqlite3.yml index 48c9b19..226bf62 100644 --- a/.github/workflows/ci-sqlite3.yml +++ b/.github/workflows/ci-sqlite3.yml @@ -1,4 +1,3 @@ ---- name: CI Sqlite3 on: @@ -13,14 +12,15 @@ concurrency: jobs: minitest: runs-on: ubuntu-latest + name: CI Sqlite3 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }} strategy: fail-fast: false matrix: ruby: - - '3.2' - - '3.1' - - '3.0' - - '2.7' +# - '3.2' +# - '3.1' +# - '3.0' +# - '2.7' - '3.3' - 'truffleruby' rails: @@ -28,11 +28,11 @@ jobs: - "7.0" - 6.1 adapter: - - sqlite3:///tmp/test.sqlite3 + - sqlite3 include: - ruby: jruby rails: 6.1 - adapter: jdbcsqlite3:///tmp/test.sqlite3 + adapter: jdbcsqlite3 steps: - name: Checkout uses: actions/checkout@v4 @@ -49,6 +49,6 @@ jobs: - name: Test env: BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile - DATABASE_URL: ${{ matrix.adapter }} + DATABASE_URL: ${{ matrix.adapter }}:///tmp/test.sqlite3 WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bundle exec rake