From 1d773a6d6c26c8b513f467f3ea660dfa456e4907 Mon Sep 17 00:00:00 2001 From: Rafael Silva Domingos Date: Fri, 14 Nov 2025 14:50:15 -0300 Subject: [PATCH 1/4] Atualiza workflow de cicd --- .github/workflows/cicd.yaml | 65 ++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 1d49ae0..c4d9d8c 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -10,9 +10,54 @@ on: workflow_dispatch: jobs: - BUILD: + BUILD-HOMOLOG: if: github.event.pull_request.merged == true runs-on: ubuntu-latest + environment: + name: homolog + steps: + + - uses: actions/checkout@v4.1.1 + + - name: Read version file + id: get_version + run: | + VERSION=$(cat version.txt) + echo "app_version=$VERSION" >> $GITHUB_ENV + + - name: Docker Login + uses: docker/login-action@v3.0.0 + with: + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Criação da Imagem docker + uses: docker/build-push-action@v5.0.0 + with: + context: ./ + file: Dockerfile + push: true + tags: | + secultceara/api-email:homolog + secultceara/api-email:${{ env.app_version }}-rc + + DEPLOY-HOMOLOG: + needs: BUILD-HOMOLOG + runs-on: mapahomolog + environment: + name: homolog + steps: + - name: Pull da imagem do dockerhub + run: sudo docker pull secultceara/api-email:homolog + - name: Restart do docker-compose para atualizar o container com a nova imagem de homologação + run: cd /opt/docker/api-email && sudo docker-compose down && sudo docker-compose up -d + + + BUILD-PRODUCTION: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + environment: + name: production steps: - uses: actions/checkout@v4.1.1 @@ -39,11 +84,13 @@ jobs: secultceara/api-email:latest secultceara/api-email:${{ env.app_version }} - #DEPLOY: - # needs: BUILD - # runs-on: mapahomolog - # steps: - # - name: Pull da imagem do dockerhub - # run: sudo docker pull secultceara/mapasculturais:homolog - # - name: Restart do docker-compose para atualizar o container com a nova imagem - # run: cd /opt/docker/mapa5 && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file + DEPLOY-PRODUCTION: + needs: BUILD-HOMOLOG + runs-on: mapaproduction + environment: + name: production + steps: + - name: Pull da imagem do dockerhub + run: sudo docker pull secultceara/api-email:latest + - name: Restart do docker-compose para atualizar o container com a nova imagem de homologação + run: cd /opt/docker/api-email && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file From 2143ac74b963cb6d6a9a93ceabb1bedae2ff030d Mon Sep 17 00:00:00 2001 From: Rafael Silva Domingos Date: Fri, 14 Nov 2025 14:52:12 -0300 Subject: [PATCH 2/4] =?UTF-8?q?Atualiza=20arquivo=20de=20cicd=20at=C3=A9?= =?UTF-8?q?=20a=20etapa=20de=20build=20para=20produ=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cicd.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index c4d9d8c..fe08226 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -84,13 +84,13 @@ jobs: secultceara/api-email:latest secultceara/api-email:${{ env.app_version }} - DEPLOY-PRODUCTION: - needs: BUILD-HOMOLOG - runs-on: mapaproduction - environment: - name: production - steps: - - name: Pull da imagem do dockerhub - run: sudo docker pull secultceara/api-email:latest - - name: Restart do docker-compose para atualizar o container com a nova imagem de homologação - run: cd /opt/docker/api-email && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file + #DEPLOY-PRODUCTION: + # needs: BUILD-HOMOLOG + # runs-on: mapaproduction + # environment: + # name: production + # steps: + # - name: Pull da imagem do dockerhub + # run: sudo docker pull secultceara/api-email:latest + # - name: Restart do docker-compose para atualizar o container com a nova imagem de homologação + # run: cd /opt/docker/api-email && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file From 5ac793808c8db23332d245667e1b4a9ee33b6d35 Mon Sep 17 00:00:00 2001 From: Rafael Silva Domingos Date: Fri, 14 Nov 2025 14:59:42 -0300 Subject: [PATCH 3/4] Corrige arquivo de workflow do cicd --- .github/workflows/cicd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index fe08226..3b7b17f 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -54,7 +54,7 @@ jobs: BUILD-PRODUCTION: - if: github.event.pull_request.merged == true + needs: DEPLOY-HOMOLOG runs-on: ubuntu-latest environment: name: production @@ -85,7 +85,7 @@ jobs: secultceara/api-email:${{ env.app_version }} #DEPLOY-PRODUCTION: - # needs: BUILD-HOMOLOG + # needs: BUILD-PRODUCTION # runs-on: mapaproduction # environment: # name: production From 5d89d207b10551944a3878abd2f2f1b68c428b52 Mon Sep 17 00:00:00 2001 From: Junior-Shyko Date: Tue, 18 Nov 2025 13:50:04 -0300 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=9A=80=20Mergiando=20vers=C3=A3o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 +++++++++ version.txt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c419b9..4d7ac41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ Todas as mudanças relevantes serão documentadas nesse arquivo. O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0), e esse projeto adere ao [Semantic Versionning](https://semver.org/spec/v2.0.0.html). +## [1.2.0] - 2025-11-18 +### Modificado +- Reorganizado mensageria e documentado +- Cobertura para os testes + +### Adicionado +- Logs para o containers +- Auditoria para envio dos emails + ## [1.1.0] - 2024-10-28 ### Modificado - Requisição para endpoint diff --git a/version.txt b/version.txt index 3eefcb9..26aaba0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.0 +1.2.0