Merge branch 'main' into develop

thxprotocol · May 22, 2024 · cc2b612 · cc2b612
2 parents 12b2993 + 1dbb4a9
commit cc2b612
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
@@ -6,7 +6,7 @@ on:
 jobs:
     buildAndTest:
         if: "(github.ref != 'refs/heads/main' && !contains(github.event.head_commit.message, 'CI:'))"
-        name: CI Pipeline
+        name: 'Build & Test'
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -79,7 +79,7 @@ jobs:
             #       projectBaseDir: apps/api
 
     bumpVersion:
-        name: 'Bump Version on develop'
+        name: 'Bump version'
         runs-on: ubuntu-latest
         if: github.ref == 'refs/heads/develop'
         needs: buildAndTest
@@ -201,7 +201,7 @@ jobs:
                   labels: ${{ steps.meta.outputs.labels }}
 
     autodeploy:
-        name: Auto deploy develop to dev.api.thx.network
+        name: 'Auto deploy'
         runs-on: ubuntu-latest
         if: github.ref == 'refs/heads/develop'
         needs: [buildAndPushImage, bumpVersion]

diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
@@ -6,7 +6,7 @@ on:
 jobs:
     buildAndTest:
         if: "!contains(github.event.head_commit.message, 'CI:')" # Skip if commit message contains 'CI:'
-        name: CI Pipeline
+        name: 'Build & Test'
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -52,7 +52,7 @@ jobs:
               run: yarn nx run app:build --prod --skip-nx-cache
 
     bumpVersion:
-        name: 'Bump Version on develop'
+        name: 'Bump version'
         runs-on: ubuntu-latest
         if: "(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main')"
         needs: buildAndTest
@@ -77,7 +77,7 @@ jobs:
                   PACKAGEJSON_DIR: 'apps/app'
 
     autodeploy:
-        name: Auto deploy develop to dev-app.thx.network
+        name: 'Auto deploy'
         runs-on: ubuntu-latest
         if: "(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main')"
         needs: [buildAndTest, bumpVersion]
@@ -145,7 +145,7 @@ jobs:
 
             - name: Send message
               env:
-                  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+                  DISCORD_WEBHOOK: ${{ env.DISCORD_WEBHOOK }}
               uses: Ilshidur/action-discord@master
               with:
                   args: "${{ needs.autodeploy.result == 'success' && '✅' || '⛔' }} Released App `${{ needs.bumpVersion.outputs.newTag }}`"
diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -6,7 +6,7 @@ on:
 jobs:
     buildAndTest:
         if: "(github.ref != 'refs/heads/main' && !contains(github.event.head_commit.message, 'CI:'))"
-        name: CI Pipeline
+        name: 'Build & Test'
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -30,7 +30,7 @@ jobs:
             #       projectBaseDir: apps/auth
 
     bumpVersion:
-        name: 'Bump Version on develop'
+        name: 'Bump version'
         runs-on: ubuntu-latest
         if: github.ref == 'refs/heads/develop'
         needs: buildAndTest
@@ -152,7 +152,7 @@ jobs:
                   labels: ${{ steps.meta.outputs.labels }}
 
     autodeploy:
-        name: Auto deploy develop to dev.auth.thx.network
+        name: 'Auto deploy'
         runs-on: ubuntu-latest
         if: github.ref == 'refs/heads/develop'
         needs: [buildAndPushImage, bumpVersion]