Update CI for master. Format CIs

MobilityDB · Dec 20, 2023 · b82ee87 · b82ee87
1 parent 0f9b5d9
commit b82ee87
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 67 deletions.
diff --git a/.github/workflows/test-develop.yml b/.github/workflows/test-develop.yml
@@ -13,40 +13,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: awalsh128/cache-apt-pkgs-action@latest
-      with:
-        packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
-        version: 1.0
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install MEOS
-      run: |
-        git clone --branch temporal https://github.com/Diviloper/MobilityDB
-        mkdir MobilityDB/build
-        cd MobilityDB/build
-        cmake .. -DMEOS=on
-        make -j
-        sudo make install
-    - name: Install python dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r pymeos_cffi/dev-requirements.txt
-        pip install -r pymeos/dev-requirements.txt
-    - name: Install pymeos_cffi
-      run: |
-        cd pymeos_cffi
-        python ./pymeos_cffi/builder/build_header.py
-        python ./pymeos_cffi/builder/build_pymeos_functions.py
-        pip install .
-        cd ..
-    - name: Test PyMEOS with pytest
-      run: |
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-        cd pymeos
-        pytest
+      - uses: actions/checkout@v3
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
+          version: 1.0
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install MEOS
+        run: |
+          git clone --branch temporal https://github.com/Diviloper/MobilityDB
+          mkdir MobilityDB/build
+          cd MobilityDB/build
+          cmake .. -DMEOS=on
+          make -j
+          sudo make install
+      - name: Install python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r pymeos_cffi/dev-requirements.txt
+          pip install -r pymeos/dev-requirements.txt
+      - name: Install pymeos_cffi
+        run: |
+          cd pymeos_cffi
+          python ./pymeos_cffi/builder/build_header.py
+          python ./pymeos_cffi/builder/build_pymeos_functions.py
+          pip install .
+          cd ..
+      - name: Test PyMEOS with pytest
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+          cd pymeos
+          pytest
diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml
@@ -9,40 +9,44 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install MEOS
-      run: |
-        apt install build-essential cmake postgresql-server-dev-15 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
-        git clone https://github.com/MobilityDB/MobilityDB
-        mkdir MobilityDB/build
-        cd MobilityDB/build
-        cmake .. -DMEOS=on
-        make -j
-        make install
-    - name: Install python dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r pymeos_cffi/dev-requirements.txt
-        pip install -r pymeos/dev-requirements.txt
-    - name: Install pymeos_cffi
-      run: |
-        cd pymeos_cffi
-        python ./pymeos_cffi/builder/build_header.py
-        python ./pymeos_cffi/builder/build_pymeos_functions.py
-        pip install .
-        cd ..
-    - name: Test PyMEOS with pytest
-      run: |
-        cd pymeos
-        pytest
+      - uses: actions/checkout@v3
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
+          version: 1.0
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install MEOS
+        run: |
+          git clone https://github.com/MobilityDB/MobilityDB
+          mkdir MobilityDB/build
+          cd MobilityDB/build
+          cmake .. -DMEOS=on
+          make -j
+          sudo make install
+      - name: Install python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r pymeos_cffi/dev-requirements.txt
+          pip install -r pymeos/dev-requirements.txt
+      - name: Install pymeos_cffi
+        run: |
+          cd pymeos_cffi
+          python ./pymeos_cffi/builder/build_header.py
+          python ./pymeos_cffi/builder/build_pymeos_functions.py
+          pip install .
+          cd ..
+      - name: Test PyMEOS with pytest
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+          cd pymeos
+          pytest