ci: merge two CI workflows into one

etalab-ia · May 17, 2024 · 1b0d06e · 1b0d06e
1 parent 5034429
commit 1b0d06e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 83 deletions.
diff --git a/.github/workflows/staging.yml → .github/workflows/build_and_deploy.yml b/.github/workflows/staging.yml → .github/workflows/build_and_deploy.yml
@@ -1,18 +1,19 @@
-name: Deploy to staging when pushing on staging
+name: Build and deploy when pushing on staging or main
 
 on:
   push:
     branches:
+      - main
       - staging
       - feat/github-ci
 
 jobs:
 
-  deploy-staging:
+  build-deploy:
 
-    environment: staging
-
-    name: Deploy to staging from ${{ github.ref_name }}/${{ github.sha }}
+    name: Deploy from ${{ github.ref_name }}/${{ github.sha }}
+    
+    environment: ${{ github.ref_name == 'main' && 'prod' || 'staging' }}
 
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml