chore: merge main back to develop

Signed-off-by: Evan Prodromou <[email protected]>
Open-Earth-Foundation · Mar 25, 2024 · 7e122d7 · 7e122d7
2 parents 46b75f7 + bf58ea2
commit 7e122d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/global-api-test.yml b/.github/workflows/global-api-test.yml
@@ -54,6 +54,6 @@ jobs:
 
       - name: Deploying service
         run: |
-          kubectl create -f k8s/cc-test-global-api-migrate.yml -n default
-          kubectl apply -f k8s/cc-test-global-api-deploy.yml -n default
+          kubectl create -f k8s/test/cc-test-global-api-migrate.yml -n default
+          kubectl apply -f k8s/test/cc-test-global-api-deploy.yml -n default
           kubectl rollout restart deployment cc-test-global-api-deploy -n default
diff --git a/.github/workflows/web-test.yml b/.github/workflows/web-test.yml
@@ -10,7 +10,6 @@ on:
       - k8s/test/cc-test/web.yml
       - .github/workflows/web-test.yml
     branches: ["main"]
-  pull_request:
 
 jobs:
   runTests:
@@ -105,7 +104,6 @@ jobs:
   deployToEKS:
     needs: pushToGHCR
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_EKS_DEV_USER }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_EKS_DEV_USER }}

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "city-catalyst",
-  "version": "0.5.0-dev.0",
+  "version": "0.5.0-rc.0",
   "private": true,
   "type": "module",
   "scripts": {