Update workflow

v-rogg · Oct 29, 2023 · f6b73bb · f6b73bb
1 parent 02183cf
commit f6b73bb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/fly-staging.yml b/.github/workflows/fly-staging.yml
@@ -5,7 +5,8 @@ on:
     branches: [dev]
 
 jobs:
-  deploy:
+
+  deploy-app:
     name: Deploy staging app
     runs-on: ubuntu-latest
     steps:
@@ -23,4 +24,7 @@ jobs:
           --build-secret WORKER_PSK=${{ secrets.WORKER_PSK }} \
           --remote-only
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+  deploy-workers:
+    uses: ./.github/workflows/workers.yml
diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
@@ -5,7 +5,8 @@ on:
     branches: [main]
 
 jobs:
-  deploy:
+
+  deploy-app:
     name: Deploy app
     runs-on: ubuntu-latest
     steps:
@@ -23,4 +24,7 @@ jobs:
           --build-secret WORKER_PSK=${{ secrets.WORKER_PSK }} \
           --remote-only
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+  deploy-workers:
+    uses: ./.github/workflows/workers.yml
diff --git a/.github/workflows/workers.yml b/.github/workflows/workers.yml
@@ -1,10 +1,10 @@
 name: CF Workers Deploy
 
 on:
-  push:
+  workflow_call:
 
 jobs:
-  deploy:
+  deploy-workers:
     name: Deploy workers
     runs-on: ubuntu-latest
     steps:
@@ -13,4 +13,4 @@ jobs:
         uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
-          workingDirectory: "workers/ps-signatures"
+          workingDirectory: "./workers/ps-signatures/"