Skip to content

Commit 85c40a6

Browse files
blocknotesblocknotes
authored
Merge pull request #60 from blocknotes/ci/workflows-refactor
CI: GitHub workflows refactor
2 parents aa58bfa + 2b08156 commit 85c40a6

86 files changed

Lines changed: 9708 additions & 4066 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/linters.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ jobs:
1212
name: Reviewdog
1313
runs-on: ubuntu-latest
1414

15+
env:
16+
DB_TEST: sqlite
17+
RAILS_VERSION: '7.1'
18+
1519
steps:
20+
- name: Install dependencies
21+
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
22+
1623
- name: Checkout repository
1724
uses: actions/checkout@v4
1825

.github/workflows/specs_mssql_70.yml renamed to .github/workflows/specs_mssql_ruby30.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 7.0 MSSQL
2+
name: Specs MSSQL Ruby 3.0
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.0', '3.3']
17-
gemfile: ['rails_7_0_mssql']
16+
ruby: ['3.0']
17+
gemfile: ['mssql_ruby30_rails61', 'mssql_ruby30_rails70']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -33,7 +33,7 @@ jobs:
3333
- 1433:1433
3434

3535
steps:
36-
- name: Install FreeTDS and lib VIPS
36+
- name: Install dependencies
3737
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
3838

3939
- name: Checkout repository

.github/workflows/specs_mssql_80.yml renamed to .github/workflows/specs_mssql_ruby32.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 8.0 MSSQL
2+
name: Specs MSSQL Ruby 3.2
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.2', '3.4']
17-
gemfile: ['rails_8_0_mssql']
16+
ruby: ['3.2']
17+
gemfile: ['mssql_ruby32_rails61', 'mssql_ruby32_rails70', 'mssql_ruby32_rails80']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -33,7 +33,7 @@ jobs:
3333
- 1433:1433
3434

3535
steps:
36-
- name: Install FreeTDS and lib VIPS
36+
- name: Install dependencies
3737
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
3838

3939
- name: Checkout repository

.github/workflows/specs_mssql_61.yml renamed to .github/workflows/specs_mssql_ruby34.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 6.1 MSSQL
2+
name: Specs MSSQL Ruby 3.4
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.0', '3.3']
17-
gemfile: ['rails_6_1_mssql']
16+
ruby: ['3.4']
17+
gemfile: ['mssql_ruby34_rails80']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -33,7 +33,7 @@ jobs:
3333
- 1433:1433
3434

3535
steps:
36-
- name: Install FreeTDS and lib VIPS
36+
- name: Install dependencies
3737
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
3838

3939
- name: Checkout repository

‎.github/workflows/specs_mysql_61.yml‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

.github/workflows/specs_mysql_71.yml renamed to .github/workflows/specs_mysql_ruby30.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 7.1 MySQL
2+
name: Specs MySQL Ruby 3.0
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.0', '3.3']
17-
gemfile: ['rails_7_1_mysql']
16+
ruby: ['3.0']
17+
gemfile: ['mysql_ruby30_rails61', 'mysql_ruby30_rails71']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -38,8 +38,8 @@ jobs:
3838
- 3306:3306
3939

4040
steps:
41-
- name: Install lib VIPS
42-
run: sudo apt-get install -y libvips-dev
41+
- name: Install dependencies
42+
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
4343

4444
- name: Checkout repository
4545
uses: actions/checkout@v4

.github/workflows/specs_mysql_80.yml renamed to .github/workflows/specs_mysql_ruby32.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 8.0 MySQL
2+
name: Specs MySQL Ruby 3.2
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.2', '3.4']
17-
gemfile: ['rails_8_0_mysql']
16+
ruby: ['3.2']
17+
gemfile: ['mysql_ruby32_rails61', 'mysql_ruby32_rails71', 'mysql_ruby32_rails72', 'mysql_ruby32_rails80']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -38,8 +38,8 @@ jobs:
3838
- 3306:3306
3939

4040
steps:
41-
- name: Install lib VIPS
42-
run: sudo apt-get install -y libvips-dev
41+
- name: Install dependencies
42+
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
4343

4444
- name: Checkout repository
4545
uses: actions/checkout@v4

.github/workflows/specs_mysql_72.yml renamed to .github/workflows/specs_mysql_ruby34.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 7.2 MySQL
2+
name: Specs MySQL Ruby 3.4
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.1', '3.2', '3.3']
17-
gemfile: ['rails_7_2_mysql']
16+
ruby: ['3.4']
17+
gemfile: ['mysql_ruby34_rails72', 'mysql_ruby34_rails80']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -38,8 +38,8 @@ jobs:
3838
- 3306:3306
3939

4040
steps:
41-
- name: Install lib VIPS
42-
run: sudo apt-get install -y libvips-dev
41+
- name: Install dependencies
42+
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
4343

4444
- name: Checkout repository
4545
uses: actions/checkout@v4

‎.github/workflows/specs_postgres_72.yml‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/specs_postgres_71.yml renamed to .github/workflows/specs_postgres_ruby30.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 7.1 Postgres
2+
name: Specs Postgres Ruby 3.0
33

44
on:
55
pull_request:
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.0', '3.3']
17-
gemfile: ['rails_7_1_postgres']
16+
ruby: ['3.0']
17+
gemfile: ['postgres_ruby30_rails61', 'postgres_ruby30_rails71']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -38,8 +38,8 @@ jobs:
3838
- 5432:5432
3939

4040
steps:
41-
- name: Install lib VIPS
42-
run: sudo apt-get install -y libvips-dev
41+
- name: Install dependencies
42+
run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
4343

4444
- name: Checkout repository
4545
uses: actions/checkout@v4
@@ -55,10 +55,3 @@ jobs:
5555

5656
- name: Run tests
5757
run: bundle exec rspec --profile
58-
59-
# - name: Upload coverage results
60-
# uses: actions/upload-artifact@main
61-
# if: always()
62-
# with:
63-
# name: coverage-report
64-
# path: coverage/index.html

0 commit comments

Comments
 (0)