Merge branch 'master' into staging/br_cgu_servidores_executivo_federal

basedosdados · Oct 5, 2023 · 3cac333 · 3cac333
2 parents 96a8c9b + f927b66
commit 3cac333
Show file tree

Hide file tree

Showing 35 changed files with 855 additions and 1,238 deletions.
diff --git a/.github/workflows/cd_staging.yaml → .github/workflows/cd-staging.yaml b/.github/workflows/cd_staging.yaml → .github/workflows/cd-staging.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,21 +4,22 @@ on:
   pull_request:
 
 jobs:
-  tests:
-    name: ${{ matrix.os }}${{ matrix.arch }} - Python ${{ matrix.python-version }} - tests
+  test:
+    name: Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
         arch: [x64]
+        os: [ubuntu-latest]
         python-version: ["3.9.x"]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.arch }}
+          python-version: ${{ matrix.python-version }}
       - name: Set up Poetry and upgrade pip
         run: |
           pip install -U pip poetry
@@ -47,3 +48,34 @@ jobs:
       - name: Run tests
         run: |
           pytest
+  lint_python:
+    name: Lint Python
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9.x"
+      - name: Set up poetry and upgrade pip
+        run: |
+          pip install -U pip poetry
+          pip install isort
+          pip install black
+          pip install autoflake
+          pip install flake8
+      - name: Install this package
+        run: poetry install
+      - name: Lint source code
+        run: poetry run lint
+  lint_docker:
+    name: Lint Dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Run hadolint
+        uses: reviewdog/action-hadolint@v1
+        with:
+          reporter: github-pr-review
diff --git a/.github/workflows/lint_docker.yaml b/.github/workflows/lint_docker.yaml
diff --git a/.github/workflows/lint_python.yaml b/.github/workflows/lint_python.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,16 +12,16 @@ repos:
     rev: 1.6.0
     hooks:
       - id: poetry-check
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        args: [--profile, black, --skip, "pipelines/{{cookiecutter.project_name}}"]
   - repo: https://github.com/psf/black
     rev: 23.9.1
     hooks:
       - id: black
         exclude: 'pipelines\/\{\{cookiecutter\.project_name\}\}.*'
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        args: [--profile, black, --skip, "pipelines/{{cookiecutter.project_name}}"]
   - repo: https://github.com/PyCQA/autoflake
     rev: v2.2.1
     hooks: