From 4af98d48441d5a2ec1af7493eb97051c4c08500c Mon Sep 17 00:00:00 2001
From: Dibik <dibik@openg2p.org>
Date: Wed, 3 Apr 2024 19:48:07 +0530
Subject: [PATCH] Added pre-commit yaml and test.yml

---
 .github/workflows/pre-commit.yml | 11 +++----
 .github/workflows/test.yml       | 51 ++++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9b5d86c..610b332 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -2,19 +2,16 @@ name: pre-commit
 
 on:
   pull_request:
-    branches:
-      - "15.0*"
   push:
-    branches:
-      - "15.0"
-      - "15.0-ocabot-*"
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f49b9b4..8e6e90e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,19 +4,20 @@ on:
   pull_request:
     branches:
       - "15.0*"
+      - "17.0*"
   push:
     branches:
       - "15.0*"
-      - "15.0-ocabot-*"
+      - "17.0*"
 env:
   OCA_GIT_USER_NAME: openg2p
   OCA_GIT_USER_EMAIL: bot@openg2p.org
 jobs:
   unreleased-deps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Detect unreleased dependencies
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           for reqfile in requirements.txt test-requirements.txt ; do
               if [ -f ${reqfile} ] ; then
@@ -29,24 +30,47 @@ jobs:
                   fi
               fi
           done
+  matrix_prep:
+    runs-on: ubuntu-22.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+    - id: set-matrix
+      run: |
+        BRANCH_NAME=$(echo ${{ github.base_ref || github.ref }} | sed -e 's,.*/\(.*\),\1,')
+        if [[ $BRANCH_NAME = 15.0* ]] ; then
+          matrix='{"include": [{
+              "container": "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest",
+              "makepot": "true",
+              "name": "test with Odoo 15"
+            },{
+              "container": "ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest",
+              "name": "test with OCB 15"
+            }]}'
+        elif [[ $BRANCH_NAME = 17.0* ]] ; then
+          matrix='{"include": [{
+              "container": "ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest",
+              "makepot": "true",
+              "name": "test with Odoo 17"
+            },{
+              "container": "ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest",
+              "name": "test with OCB 17"
+            }]}'
+        fi
+        echo "matrix=$matrix" | tr -d '\n' >> $GITHUB_OUTPUT
   test:
-    runs-on: ubuntu-latest
+    needs: matrix_prep
+    runs-on: ubuntu-22.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     permissions:
       contents: write
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
-            makepot: "true"
-            name: test with Odoo
-          - container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
-            name: test with OCB
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
     services:
       postgres:
-        image: postgres:9.6
+        image: postgres:12.0
         env:
           POSTGRES_USER: odoo
           POSTGRES_PASSWORD: odoo
@@ -54,7 +78,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Install addons and dependencies
@@ -69,6 +93,7 @@ jobs:
         run: oca_init_test_database
       - name: Run tests
         run: oca_run_tests
+      - uses: codecov/codecov-action@v1
       - name: Update .pot files
         run: oca_export_and_push_pot https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
         if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'openg2p' }}