Moved ingest actions to ci.yaml and pre-commit

EURODEO · Jan 12, 2024 · 95d3c6e · 95d3c6e
1 parent 4a5c62f
commit 95d3c6e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 76 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,9 @@ name: CI
 on:
   push:
     branches:
-      - '**'
+      - "**"
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
+      - "[0-9]+.[0-9]+.[0-9]+"
 
 permissions:
   contents: read
@@ -14,31 +14,31 @@ jobs:
   pre-commit-hook:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-    - name: Install pre-commit
-      run: python -m pip install pre-commit
-      shell: bash
-    - name: Show pre-commit requirements
-      run: python -m pip freeze --local
-      shell: bash
-    - uses: actions/cache@v3
-      with:
-        path: ~/.cache/pre-commit
-        key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-    - name: Run pre-commit for all files
-      run: pre-commit run --config './.pre-commit-config.yaml' --all-files --color=always --show-diff-on-failure
-      shell: bash
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+      - name: Install pre-commit
+        run: python -m pip install pre-commit
+        shell: bash
+      - name: Show pre-commit requirements
+        run: python -m pip freeze --local
+        shell: bash
+      - uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit for all files
+        run: pre-commit run --config './.pre-commit-config.yaml' --all-files --color=always --show-diff-on-failure
+        shell: bash
 
-  test:
+  test-datastore:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: "3.11"
 
       - name: Copy Protobuf files to Dockerfile directories
         run: ./ci/docker/copy-protobuf.sh
@@ -85,3 +85,28 @@ jobs:
       - name: Cleanup
         if: always()
         run: docker compose down --volumes
+  test-ingest:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10"] # Add 3.11 back pybind11 bug is fixed
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v3
+      - name: Ubuntu setup
+        run: sudo apt update && sudo apt install libeccodes-data	rapidjson-dev	pybind11-dev libssl-dev
+      - name: Python Setup
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - name: Checkout Source
+        uses: actions/checkout@v3
+      - name: Install Dependencies
+        run: |
+          pip install --upgrade pip
+          pip install pytest-timeout
+          pip install pytest-cov
+          pip install ./ingest
+      - name: Run Tests
+        run: python -m pytest -v --timeout=60 ./ingest
diff --git a/.github/workflows/cpp-syntax.yml b/.github/workflows/cpp-syntax.yml
diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,13 +8,19 @@ repos:
         entry: ./ci/go/go-fmt.sh
         language: script
         pass_filenames: false
-#      # go-vet ~ Finds subtle issues in Go where your code may not work as intended
-#      - id: go-vet
-#        name: go-vet
-#        description: "Finds subtle issues in Go where your code may not work as intended."
-#        entry: ./ci/go/go-vet.sh
-#        language: script
-#        pass_filenames: false
+  #      # go-vet ~ Finds subtle issues in Go where your code may not work as intended
+  #      - id: go-vet
+  #        name: go-vet
+  #        description: "Finds subtle issues in Go where your code may not work as intended."
+  #        entry: ./ci/go/go-vet.sh
+  #        language: script
+  #        pass_filenames: false
+
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: master
+    hooks:
+      - id: clang-format
+        args: [--style=llvm]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
@@ -53,11 +59,7 @@ repos:
     rev: 7.0.0
     hooks:
       - id: flake8
-        args:
-          [
-            "--ignore=W503",
-            "--max-line-length=120",
-          ]
+        args: ["--ignore=W503", "--max-line-length=120"]
 
   # hadolint ~ Docker linter
   - repo: https://github.com/hadolint/hadolint