MAINT: revert PR to avoid tests to run if linting fails (#465)

Author: theroggy

.github/workflows/docker-gdal.yml

@@ -1,14 +1,19 @@
 name: Docker GDAL Test
 
-on: [workflow_call]  # will be called from lint workflow.
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
 
 # cancel running jobs on new commit to PR
 concurrency:
-  group: Tests-docker-gdal-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  Tests-docker-gdal:
+  TestLinux:
     name: GDAL ${{ matrix.container }}
     runs-on: ubuntu-latest
     strategy:

.github/workflows/lint.yml

@@ -17,12 +17,3 @@ jobs:
         with:
           python-version: "3.11"
       - uses: pre-commit/[email protected]
-
-  Call-tests-conda:
-    needs: [Linting]  # require linting to pass before tests run
-    uses: ./.github/workflows/tests-conda.yml
-  
-  Call-tests-docker-gdal:
-    needs: [Linting]  # require linting to pass before tests run
-    uses: ./.github/workflows/docker-gdal.yml
-  

.github/workflows/tests-conda.yml

@@ -1,14 +1,19 @@
 name: Conda Tests
 
-on: [workflow_call]  # will be called from lint workflow.
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
 
 # cancel running jobs on new commit to PR
 concurrency:
-  group: Tests-conda-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  Tests-conda:
+  test:
     name: ${{ matrix.os }}, python ${{ matrix.python }}, ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
     defaults: