From 0ac1bfb2bc880858b9ba74ade850c2cf8de2328a Mon Sep 17 00:00:00 2001
From: Nikita Shilnikov <fg@flashgordon.ru>
Date: Fri, 15 Mar 2024 14:23:23 +0100
Subject: [PATCH] Update GHA config

---
 .github/workflows/ci.yml        | 14 ++++++++------
 .github/workflows/custom/ci.yml | 13 ++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9be6cba6..451fc9867 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,11 +27,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+        - '3.3'
+        - '3.2'
         - '3.1'
         - '3.0'
-        - '2.7'
         include:
-        - ruby: '3.1'
+        - ruby: '3.3'
           use_dry_transformer_master: 'true'
           use_use_rom_sql_master: 'true'
     env:
@@ -44,7 +45,7 @@ jobs:
       CODACY_PROJECT_TOKEN: "${{secrets.CODACY_PROJECT_TOKEN}}"
       APT_DEPS: libpq-dev libsqlite3-dev
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Install package dependencies
       run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
     - name: Set up Ruby
@@ -67,11 +68,12 @@ jobs:
         coverage-reports: coverage/coverage.xml
     services:
       db:
-        image: postgres:10.8
+        image: postgres:16.2
         env:
           POSTGRES_USER: runner
           POSTGRES_PASSWORD: ''
           POSTGRES_DB: rom_repository
+          POSTGRES_HOST_AUTH_METHOD: trust
         ports:
         - 5432:5432
         options: "--health-cmd pg_isready --health-interval 10s --health-timeout 5s
@@ -84,13 +86,13 @@ jobs:
       GITHUB_LOGIN: rom-bot
       GITHUB_TOKEN: "${{secrets.GH_PAT}}"
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Install package dependencies
       run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.3
     - name: Install dependencies
       run: gem install ossy --no-document
     - name: Trigger release workflow
diff --git a/.github/workflows/custom/ci.yml b/.github/workflows/custom/ci.yml
index 138c80dd1..149b18ed6 100644
--- a/.github/workflows/custom/ci.yml
+++ b/.github/workflows/custom/ci.yml
@@ -2,25 +2,24 @@ jobs:
   tests:
     services:
       db:
-        image: postgres:10.8
+        image: postgres:16.2
         env:
           POSTGRES_USER: runner
           POSTGRES_PASSWORD: ""
           POSTGRES_DB: rom_repository
+          POSTGRES_HOST_AUTH_METHOD: trust
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     strategy:
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
           - "3.0"
-          - "2.7"
-          - "2.6"
-          - "2.5"
-          - "jruby"
-          - "truffleruby"
         include:
-          - ruby: "2.7"
+          - ruby: "3.3"
             coverage: "true"
             use_transproc_master: "true"
             use_use_rom_sql_master: "true"