From 71833f5838f7a89e595b581443ac8110b3849512 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Tue, 9 Sep 2025 00:32:00 +0200
Subject: [PATCH] Deploy API lambda to staging during release

---
 .../workflows/deploy-api-lambda-staging.yml   | 19 -------------------
 .github/workflows/release.yml                 | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 .github/workflows/deploy-api-lambda-staging.yml

diff --git a/.github/workflows/deploy-api-lambda-staging.yml b/.github/workflows/deploy-api-lambda-staging.yml
deleted file mode 100644
index d8aa73377..000000000
--- a/.github/workflows/deploy-api-lambda-staging.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: "Deploy API Lambda (staging)"
-
-on:
-  release: 
-    types:
-      - published
-
-permissions:
-  contents: read
-  
-jobs: 
-  deploy:
-    uses: ./.github/workflows/deploy-api-lambda.yml
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      environment: staging
-      ref: refs/tags/${{ github.event.release.tag_name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a785f935d..a8667a2a6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -75,8 +75,19 @@ jobs:
     uses: ./.github/workflows/build-link-index-updater-lambda.yml
     with:
       ref: ${{ needs.release-drafter.outputs.tag_name }}
+      
+  deploy-api-lambda-staging:
+    needs: 
+      - release-drafter
+    uses: ./.github/workflows/deploy-api-lambda.yml
+    permissions:
+      id-token: write
+      contents: read
+    with:
+      environment: staging
+      ref: refs/tags/${{ needs.release-drafter.outputs.tag_name }}
 
-  release-lambda:
+  deploy-link-index-updater-lambda-prod:
     environment: 
       name: link-index-updater-prod
     runs-on: ubuntu-latest
@@ -163,8 +174,9 @@ jobs:
   publish-release:
     needs:
       - release
-      - release-lambda
       - release-drafter
+      - deploy-api-lambda-staging
+      - deploy-link-index-updater-lambda-prod
     runs-on: ubuntu-latest
     permissions: 
       contents: write