chore(cicd): update build and test pipeline

marcelovicentegc · marcelovicentegc · commit 6ead5158d12e · 2024-06-23T13:24:21.000+02:00
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -1,68 +1,76 @@
-name: Build and Test app
+name: Build frontend, backend and Docker image
 
 on:
   push:
     branches:
       - "**"
-      - "!hml"
-      - "!prd"
-      - "!prd-host"
 
 jobs:
-  # Run tests.
-  # See also https://docs.docker.com/docker-hub/builds/automated-testing/
   build-frontend:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12.x]
+    workdir: frontend
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        working-directory: ./frontend
+        name: Install pnpm
         with:
-          node-version: ${{ matrix.node-version }}
-      - run: cd frontend && npm ci
-      - run: cd frontend && npm run check --if-present
-      - run: cd frontend && npm run test:static --if-present
-      - run: cd frontend && npm test --if-present
-      - run: cd frontend && npm run build --if-present
+          version: 8
+          run_install: false
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        working-directory: ./frontend
+        with:
+          node-version: 20
+          cache: "pnpm"
+      - name: Get pnpm store directory
+        working-directory: ./frontend
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        working-directory: ./frontend
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+      - name: Install dependencies
+        working-directory: ./frontend
+        run: pnpm install
+      - name: Build frontend
+        working-directory: ./frontend
+        run: pnpm build
 
-  build-django:
+  build-backend:
     runs-on: ubuntu-latest
     needs: build-frontend
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.8]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Dependencies
+          python-version: 3.12
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          pip install poetry
+          poetry install --no-dev
       - name: Run Tests
         env:
           TEST: 1
         run: |
-          python manage.py test
+          poetry run manage.py test
 
   test-image:
     runs-on: ubuntu-latest
     needs: build-django
     env:
       SECRET_KEY: ${{ secrets.SECRET_KEY }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Run tests
+      - uses: actions/checkout@v4
+      - name: Test Docker build
         run: |
-          if [ -f docker-compose.test.yml ]; then
-            docker-compose --file docker-compose.test.yml build
-            docker-compose --file docker-compose.test.yml run sut
-          else
-            docker build . --build-arg AUTH_TOKEN=${{ secrets.AUTH_KEY }} --build-arg GTAG_ID=${{ secrets.GTAG_ID }} --file Dockerfile
-          fi
+          docker build . --build-arg AUTH_TOKEN=${{ secrets.AUTH_KEY }} --file Dockerfile
diff --git a/core/settings/base.py b/core/settings/base.py
@@ -59,13 +59,6 @@
 # Application definition
 
 INSTALLED_APPS = [ 
-    "unfold",  # before django.contrib.admin
-    "unfold.contrib.filters",  # optional, if special filters are needed
-    "unfold.contrib.forms",  # optional, if special form elements are needed
-    "unfold.contrib.inlines",  # optional, if special inlines are needed
-    # "unfold.contrib.import_export",  # optional, if django-import-export package is used
-    # "unfold.contrib.guardian",  # optional, if django-guardian package is used
-    # "unfold.contrib.simple_history",  # optional, if django-simple-history package is used
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
diff --git a/frontend/containers/LandingPage/index.tsx b/frontend/containers/LandingPage/index.tsx
@@ -43,8 +43,8 @@ const LandingPage: React.FC = () => {
               onClick={() =>
                 window.open(
                   PRODUCTION
-                    ? "/admin/authtoken/tokenproxy/add/"
-                    : "http://localhost:8000/admin/authtoken/tokenproxy/add/",
+                    ? "/admin/authtoken/token/add/"
+                    : "http://localhost:8000/admin/authtoken/token/add/",
                   "_blank"
                 )
               }
diff --git a/frontend/templates/frontend/dev/index.html b/frontend/templates/frontend/dev/index.html
@@ -1,19 +1,11 @@
 <!DOCTYPE html>
-<html lang="pt-br">
+<html lang="en-us">
   <head>
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="theme-color" content="#0C4B33" />
     <meta name="background-color" content="#0C4B33" />
     <meta name="author" content="Marcelo Cardoso" />
-    <link
-      rel="preload"
-      href="https://fonts.googleapis.com/css2?family=Barlow&display=swap"
-      as="style"
-      onload="this.onload=null;this.rel='stylesheet'"
-    />
-    <link rel="preconnect" href="https://res.cloudinary.com" />
-    <link rel="preconnect" href="https://www.google-analytics.com" />
   </head>
   <body>
     <div id="root"></div>
diff --git a/frontend/templates/frontend/index.html b/frontend/templates/frontend/index.html
@@ -1,6 +1,6 @@
 {% load static %}
 <!DOCTYPE html>
-<html lang="pt-br">
+<html lang="en-us">
   <head>
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -10,14 +10,6 @@
     <link rel="icon" type="image/png" href="{% static "frontend/logo-32.png" %}" />
     <link rel="manifest" href="{% static "frontend/manifest.json" %}" />
     <link rel="apple-touch-icon" href="{% static "frontend/logo-512.png" %}"/>
-    <link
-      rel="preload"
-      href="https://fonts.googleapis.com/css2?family=Barlow&display=swap"
-      as="style"
-      onload="this.onload=null;this.rel='stylesheet'"
-    />  
-    <link rel="preconnect" href="https://res.cloudinary.com" />
-    <link rel="preconnect" href="https://www.google-analytics.com" />
   </head>
   <body>
     <div id="root"></div>

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ const LandingPage: React.FC = () => {`
`43`	`43`	`onClick={() =>`
`44`	`44`	`window.open(`
`45`	`45`	`PRODUCTION`
`46`		`- ? "/admin/authtoken/tokenproxy/add/"`
`47`		`- : "http://localhost:8000/admin/authtoken/tokenproxy/add/",`
	`46`	`+ ? "/admin/authtoken/token/add/"`
	`47`	`+ : "http://localhost:8000/admin/authtoken/token/add/",`
`48`	`48`	`"_blank"`
`49`	`49`	`)`
`50`	`50`	`}`