🚧 test for new oaf action

Coperh · Nov 8, 2024 · 9c6e446 · 9c6e446
1 parent a584d94
commit 9c6e446
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 53 deletions.
diff --git a/.github/workflows/oaf-check.yml b/.github/workflows/oaf-check.yml
@@ -5,27 +5,16 @@ on:
     branches:
       - master
     tags:
-      - '**'
-  pull_request:
+      - '*'
+#  pull_request:
   workflow_dispatch:
-  schedule:
-    - cron: '00 7 * * 1'
+#  schedule:
+#    - cron: '0 7 * * 1'
 
-jobs:
-  run:
-    runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-          cache: 'pip'
-          cache-dependency-path: 'requirements/dev.txt'
-      - name: Install dependencies
-        run: pip install $(grep "pip-tools==" requirements/dev.txt)
-      - name: Run compile dependencies
-        run: ./bin/compile_dependencies.sh --upgrade-package open-api-framework
+jobs:
+  open-api-workflow-check-oas:
+    uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@feature/udate-oaf-pr
 
-      - name: Check git diff
-        run: git diff --exit-code -- requirements/*.txt
+    with:
+      python-version: '3.11'
diff --git a/.github/workflows/oas-check.yml b/.github/workflows/oas-check.yml
@@ -1,24 +1,18 @@
-name: check-oas
+name: Check Open API Framework Version
 
 on:
   push:
-    paths:
-      - "src/objects/api/*/openapi.yaml"
-      - .github/workflows/oas-check.yml
     branches:
-      - '**'
+      - master
+    tags:
+      - '*'
   workflow_dispatch:
+#  schedule:
+#    - cron: '0 7 * * 1'
 
 jobs:
   open-api-workflow-check-oas:
-    uses: maykinmedia/open-api-workflows/.github/workflows/oas-check.yml@v1
-    strategy:
-      matrix:
-        version:
-          - v2
+    uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@feature/update-oaf-pr
+
     with:
-      schema-path: 'src/objects/api/${{ matrix.version }}/openapi.yaml'
-      schema-options: "--api-version ${{ matrix.version }}"
       python-version: '3.11'
-      django-settings-module: 'objects.conf.ci'
-      apt-packages: 'libgdal-dev gdal-bin'
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -97,7 +97,6 @@ django==4.2.15
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-spectacular-sidecar
     #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
@@ -178,10 +177,8 @@ djangorestframework-inclusions==1.2.0
     # via open-api-framework
 drf-nested-routers==0.93.3
     # via commonground-api-common
-drf-spectacular[sidecar]==0.27.2
+drf-spectacular==0.27.2
     # via open-api-framework
-drf-spectacular-sidecar==2024.7.1
-    # via drf-spectacular
 drf-yasg==1.21.7
     # via commonground-api-common
 ecs-logging==2.1.0
@@ -241,7 +238,7 @@ notifications-api-common==0.2.2
     # via
     #   -r requirements/base.in
     #   commonground-api-common
-open-api-framework==0.8.1
+open-api-framework==0.8.0
     # via -r requirements/base.in
 orderedmultidict==1.0.1
     # via furl

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -146,7 +146,6 @@ django==4.2.15
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-spectacular-sidecar
     #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
@@ -247,6 +246,7 @@ django-solo==2.2.0
 django-two-factor-auth[phonenumberslite,webauthn]==1.17.0
     # via
     #   -r requirements/base.txt
+    #   django-two-factor-auth
     #   maykin-2fa
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
@@ -278,14 +278,10 @@ drf-nested-routers==0.93.3
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-drf-spectacular[sidecar]==0.27.2
+drf-spectacular==0.27.2
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-drf-spectacular-sidecar==2024.7.1
-    # via
-    #   -r requirements/base.txt
-    #   drf-spectacular
 drf-yasg==1.21.7
     # via
     #   -r requirements/base.txt
@@ -402,7 +398,7 @@ notifications-api-common==0.2.2
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-open-api-framework==0.8.1
+open-api-framework==0.8.0
     # via -r requirements/base.txt
 orderedmultidict==1.0.1
     # via

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -157,7 +157,6 @@ django==4.2.15
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-spectacular-sidecar
     #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
@@ -262,6 +261,7 @@ django-solo==2.2.0
 django-two-factor-auth[phonenumberslite,webauthn]==1.17.0
     # via
     #   -r requirements/base.txt
+    #   django-two-factor-auth
     #   maykin-2fa
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
@@ -299,14 +299,10 @@ drf-nested-routers==0.93.3
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-drf-spectacular[sidecar]==0.27.2
+drf-spectacular==0.27.2
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-drf-spectacular-sidecar==2024.7.1
-    # via
-    #   -r requirements/base.txt
-    #   drf-spectacular
 drf-yasg==1.21.7
     # via
     #   -r requirements/base.txt
@@ -424,7 +420,7 @@ notifications-api-common==0.2.2
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-open-api-framework==0.8.1
+open-api-framework==0.8.0
     # via -r requirements/base.txt
 orderedmultidict==1.0.1
     # via