ci: replace all reusable workflows with hotosm/gh-workflows

hotosm · Oct 22, 2023 · 35cdf24 · 35cdf24
1 parent 9cc4c79
commit 35cdf24
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 194 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -17,16 +17,16 @@ on:
 
 jobs:
   pytest:
-    uses: ./.github/workflows/r-pytest.yml
+    uses: hotosm/gh-workflows/.github/workflows/test_pytest_compose.yml@main
     with:
-      # TODO update to build image prior to test, like r-pytest.yml?
-      # Would prevent failures if the CI image does not contain new deps yet
       image_tag: ci-${{ github.ref_name }}
       docker_compose_service: api
     secrets: inherit
 
   frontend-tests:
-    uses: ./.github/workflows/r-frontend_tests.yml
+    uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@main
+    with:
+      working_dir: src/frontend
 
   backend-build:
     uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main

diff --git a/.github/workflows/pr_test_backend.yml b/.github/workflows/pr_test_backend.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   pytest:
-    uses: ./.github/workflows/r-pytest.yml
+    uses: hotosm/gh-workflows/.github/workflows/test_pytest_compose.yml@main
     with:
       docker_compose_service: api
       cache_imgs: |

diff --git a/.github/workflows/pr_test_frontend.yml b/.github/workflows/pr_test_frontend.yml
@@ -14,4 +14,6 @@ on:
 
 jobs:
   frontend-tests:
-    uses: ./.github/workflows/r-frontend_tests.yml
+    uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@main
+    with:
+      working_dir: src/frontend
diff --git a/.github/workflows/r-frontend_tests.yml b/.github/workflows/r-frontend_tests.yml
diff --git a/.github/workflows/r-pytest.yml b/.github/workflows/r-pytest.yml