From 1c92b6bbc558c71a063e027bf72aabff29b3eb24 Mon Sep 17 00:00:00 2001 From: Lalith Kota Date: Sat, 30 Mar 2024 22:39:13 +0530 Subject: [PATCH 1/3] Fixed test-requirements Signed-off-by: Lalith Kota --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 37d8df5..b1fb822 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,2 @@ -git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_base -git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_individual +git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_base +git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_individual From 17ad457a744ace55ac6fc0364a4fe1953c9616b1 Mon Sep 17 00:00:00 2001 From: Lalith Kota Date: Sun, 31 Mar 2024 01:42:57 +0530 Subject: [PATCH 2/3] Test action: Fixed matrix Signed-off-by: Lalith Kota --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b041d2e..8e6e90e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,13 +31,13 @@ jobs: fi done matrix_prep: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - id: set-matrix run: | - BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,') + 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", @@ -57,10 +57,10 @@ jobs: "name": "test with OCB 17" }]}' fi - echo "matrix<> $GITHUB_OUTPUT + echo "matrix=$matrix" | tr -d '\n' >> $GITHUB_OUTPUT test: needs: matrix_prep - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: ${{ matrix.container }} name: ${{ matrix.name }} permissions: From 98ee1b523016b02da97e6cb79fe963cfa8d2b7d8 Mon Sep 17 00:00:00 2001 From: Lalith Kota Date: Sun, 31 Mar 2024 02:05:07 +0530 Subject: [PATCH 3/3] Fixed test-requirements fastapi Signed-off-by: Lalith Kota --- test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test-requirements.txt b/test-requirements.txt index b1fb822..502e911 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,3 @@ +git+https://github.com/OpenG2P/rest-framework@17.0#subdirectory=fastapi git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_base git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_individual