diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 97d8c1489..08dce2918 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -12,6 +12,7 @@ concurrency: jobs: semantic-version: + name: Semantic Version outputs: semanticVersion: ${{ steps.changelog.outputs.version }} tag: ${{ steps.changelog.outputs.tag }} @@ -31,6 +32,7 @@ jobs: skip-commit: 'true' skip-on-empty: 'false' git-push: 'true' + retag-images: needs: [semantic-version] runs-on: ubuntu-22.04 @@ -139,6 +141,7 @@ jobs: config: pageLoadTimeout=10000 working-directory: ./frontend browser: ${{ matrix.browser }} + - uses: actions/upload-artifact@v3 if: failure() with: @@ -146,7 +149,6 @@ jobs: path: ./cypress/screenshots if-no-files-found: ignore # 'warn' or 'error' are also available, defaults to `warn` - deploys-prod: name: PROD Deploys needs: [cypress-e2e, integration-tests,deploys-test, semantic-version] # all of this needed to Go To PROD. @@ -169,17 +171,13 @@ jobs: cd charts/${{ github.event.repository.name }} helm dependency update helm upgrade --install --wait --atomic ${{ github.event.repository.name }} --values values.yaml --set-string global.repository=${{ github.repository }} --set-string backend.containers[0].tag=${{ needs.semantic-version.outputs.semanticVersion }} --set-string backend.initContainers[0].tag=${{ needs.semantic-version.outputs.semanticVersion }} --set-string frontend.containers[0].tag=${{ needs.semantic-version.outputs.semanticVersion }} --set-string bitnami-pg.auth.password=${{secrets.DB_PASSWORD}} --set-string bitnami-pg.auth.postgresPassword=${{secrets.DB_PASSWORD}} --timeout 10m . - - name: Create Release - uses: softprops/action-gh-release@v1 + + - name: Create Tags + uses: jaywcjlove/create-tag-action@v1.3.19 if: ${{ needs.semantic-version.outputs.semanticVersion != '' }} - continue-on-error: true - env: - GITHUB_TOKEN: ${{ github.token }} - with: - token: ${{ github.token }} - tag_name: ${{ needs.semantic-version.outputs.tag }} - name: ${{ needs.semantic-version.outputs.tag }} - body: ${{ needs.semantic-version.outputs.clean_changelog }} + run: | + git tag ${{ needs.semantic-version.outputs.semanticVersion }} + git push origin --tag cleanup-prod: name: PROD Pod cleanup