From 08ec80d8288b192f6e2c8c344e161fdc927a61b5 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Mon, 9 Dec 2024 13:03:34 +0100 Subject: [PATCH] feat(CI) : change github actions to enable CI on feat/import-monitorings --- .github/workflows/cypress.yml | 6 +++--- .github/workflows/pytest.yml | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index aaadb600ce..eb650c0502 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -5,13 +5,13 @@ on: - master - hotfixes - develop - - feat/import + - feat/import-monitorings pull_request: branches: - master - hotfixes - develop - - feat/import + - feat/import-monitorings jobs: mount_app_and_run_cypress: @@ -111,7 +111,7 @@ jobs: cp ./config/settings.ini.sample ./config/settings.ini ./install/05_install_frontend.sh --ci env: - GEONATURE_CONFIG_FILE: '${{ github.workspace }}/config/test_config.toml' + GEONATURE_CONFIG_FILE: "${{ github.workspace }}/config/test_config.toml" - name: Install core modules run: | geonature install-gn-module contrib/occtax OCCTAX --build=false diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 313a345565..b368bcb1db 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -6,11 +6,13 @@ on: - master - hotfixes - develop + - feat/import-monitorings pull_request: branches: - master - hotfixes - develop + - feat/import-monitorings jobs: build: @@ -18,16 +20,16 @@ jobs: strategy: fail-fast: false matrix: - debian-version: ['11', '12'] + debian-version: ["11", "12"] include: - - debian-version: '11' - python-version: '3.9' - postgres-version: '13' - postgis-version: '3.2' - - debian-version: '12' - python-version: '3.11' - postgres-version: '15' - postgis-version: '3.3' + - debian-version: "11" + python-version: "3.9" + postgres-version: "13" + postgis-version: "3.2" + - debian-version: "12" + python-version: "3.11" + postgres-version: "15" + postgis-version: "3.3" name: Debian ${{ matrix.debian-version }} @@ -68,7 +70,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' + cache: "pip" - name: Install GDAL run: | sudo apt update