- make deploy job depend on ci

- fix secrets as variables
carafelix · Jun 20, 2024 · 9881f56 · 9881f56
1 parent bbd50c5
commit 9881f56
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: ci
+name: tests
 
 on:
   push:
@@ -7,9 +7,9 @@ on:
       - dev
 
 jobs:
-  deploy:
+  tests:
     runs-on: ubuntu-latest
-    name: ci
+    name: tests
     steps:
       - uses: actions/checkout@v4
         env:
@@ -18,9 +18,10 @@ jobs:
           SUDO_SECRET: ${{ secrets.SUDO_SECRET }}
       - run: |
             touch .dev.vars
-            echo SUDO_SECRET="SUDO_SECRET" >> .dev.vars
-            echo XATA_API_KEY="XATA_API_KEY" >> .dev.vars
-            echo XATA_DB="XATA_DB" >> .dev.vars
+            echo SUDO_SECRET="$SUDO_SECRET" >> .dev.vars
+            echo XATA_API_KEY="$XATA_API_KEY" >> .dev.vars
+            echo XATA_DB="$XATA_DB" >> .dev.vars
+            ls
       - run: npm install
       - run: npm run test
 
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -1,12 +1,16 @@
 name: Deploy
 
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: ["Run Tests"]
+    branches: [main]
+    types: 
+      - completed
+
 
 jobs:
   deploy:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     name: Deploy
     steps:

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
    "version": "0.0.1",
    "private": true,
    "scripts": {
-      "test": "vitest",
+      "test": "vitest run",
       "deploy": "wrangler deploy",
       "dev": "wrangler dev --port 8787",
       "cf-typegen": "wrangler types"