Update core_api CI/CD

benjaminbours · Aug 3, 2024 · d7b3f3c · d7b3f3c
1 parent 90ffbc9
commit d7b3f3c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 33 deletions.
diff --git a/.github/workflows/back_cd_staging.yml → .github/workflows/core_api_cd.yml b/.github/workflows/back_cd_staging.yml → .github/workflows/core_api_cd.yml
@@ -1,4 +1,4 @@
-name: Push backend image
+name: Push core_api image
 
 on:
   workflow_dispatch:
@@ -33,7 +33,7 @@ jobs:
 
       - name: Get version
         id: package
-        run: echo "::set-output name=version::$(node -p "require('./back/package.json').version")"
+        run: echo "::set-output name=version::$(node -p "require('./core_api/package.json').version")"
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -45,12 +45,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./back/Dockerfile.back
+          file: ./core_api/Dockerfile
           target: final
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/composite-back:${{ steps.package.outputs.version }},
-            ${{ secrets.DOCKERHUB_USERNAME }}/composite-back:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/composite-core_api:${{ steps.package.outputs.version }},
+            ${{ secrets.DOCKERHUB_USERNAME }}/composite-core_api:latest
           build-args: |
             POSTGRES_USER=${{ secrets.POSTGRES_USER }}
             POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}

diff --git a/.github/workflows/back_ci.yml → .github/workflows/core_api_ci.yml b/.github/workflows/back_ci.yml → .github/workflows/core_api_ci.yml
@@ -1,11 +1,11 @@
-name: Install, test and build API
+name: Install, test and build core_api
 
 # on: [pull_request, workflow_dispatch]
 on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'back/**'
+      - 'core_api/**'
 
 jobs:
   build:
@@ -44,16 +44,16 @@ jobs:
     - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
       name: List the state of node modules
       continue-on-error: true
-      run: npm list -w back
+      run: npm list -w core_api
 
     - name: Install dependencies
-      run: npm install -w packages -w back && cd back && npx prisma generate
+      run: npm install -w packages -w core_api && cd core_api && npx prisma generate
 
     - name: Build packages
       run: npm run build -w packages
 
     - name: Lint
-      run: npm run lint -w back
+      run: npm run lint -w core_api
 
     - name: Build the project
-      run: npm run build -w back
+      run: npm run build -w core_api
diff --git a/.github/workflows/front_cd_staging.yml → .github/workflows/front_cd.yml b/.github/workflows/front_cd_staging.yml → .github/workflows/front_cd.yml
diff --git a/core_api/package.json b/core_api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "composite-back",
+  "name": "composite-core-api",
   "version": "1.0.0-next.21",
   "description": "",
   "author": "",

diff --git a/package-lock.json b/package-lock.json
diff --git a/real_time_api/.gitignore b/real_time_api/.gitignore
@@ -40,22 +40,5 @@ data
 .env
 .env.hathora
 .env.local
-<<<<<<< HEAD
 .env.staging
 .env.production
-=======
-.env.hathora
-
-# temp directory
-.temp
-.tmp
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
->>>>>>> 05f656b (real_time_api: Update env variables)