(use environments

sillsdev · Jul 11, 2024 · 8db894d · 8db894d
1 parent 67db6cc
commit 8db894d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 25 deletions.
diff --git a/.github/workflows/release-live.yml b/.github/workflows/release-live.yml
@@ -1,3 +1,4 @@
+# Releases from sf-qa branch to Live production server.
 name: "Release to Live"
 
 env:
@@ -23,7 +24,7 @@ on:
         type: boolean
         default: false
       from-staging-version:
-        description: "QA version from which to release (eg '123'). Leave blank for latest."
+        description: "QA version from which to release (eg '123' or '234'). Leave blank for latest."
         required: false
         type: string
         default: ""
@@ -63,6 +64,9 @@ jobs:
     name: "Deploy to Live"
     uses: ./.github/workflows/release.yml
     needs: determine_version
+    environment:
+      name: "production"
+      url: "https://scriptureforge.org"
     with:
       dotnet_version: "8.0.x"
       node_version: "18.20.2"
@@ -78,15 +82,15 @@ jobs:
       project: "SIL.XForge.Scripture"
 
     secrets:
-      deploy_server: ${{secrets.live_deploy_server}}
-      deploy_known_hosts: ${{secrets.live_deploy_known_hosts}}
-      deploy_ssh_private_key: ${{secrets.live_deploy_ssh_private_key}}
-      auth_backend_secret: ${{ secrets.live_auth_backend_secret }}
-      auth_webhook_password: ${{ secrets.live_auth_webhook_password }}
-      paratext_client_id: ${{secrets.live_paratext_client_id}}
-      paratext_api_token: ${{ secrets.live_paratext_api_token }}
-      paratext_resource_password_base64: ${{ secrets.live_paratext_resource_password_base64 }}
-      paratext_resource_password_hash: ${{ secrets.live_paratext_resource_password_hash }}
-      serval_client_id: ${{secrets.live_serval_client_id}}
-      serval_client_secret: ${{ secrets.live_serval_client_secret }}
-      serval_webhook_secret: ${{ secrets.live_serval_webhook_secret }}
+      deploy_server: ${{secrets.deploy_server}}
+      deploy_known_hosts: ${{secrets.deploy_known_hosts}}
+      deploy_ssh_private_key: ${{secrets.deploy_ssh_private_key}}
+      auth_backend_secret: ${{ secrets.auth_backend_secret }}
+      auth_webhook_password: ${{ secrets.auth_webhook_password }}
+      paratext_client_id: ${{secrets.paratext_client_id}}
+      paratext_api_token: ${{ secrets.paratext_api_token }}
+      paratext_resource_password_base64: ${{ secrets.paratext_resource_password_base64 }}
+      paratext_resource_password_hash: ${{ secrets.paratext_resource_password_hash }}
+      serval_client_id: ${{secrets.serval_client_id}}
+      serval_client_secret: ${{ secrets.serval_client_secret }}
+      serval_webhook_secret: ${{ secrets.serval_webhook_secret }}
diff --git a/.github/workflows/release-qa.yml b/.github/workflows/release-qa.yml
@@ -1,3 +1,4 @@
+# Releases from master branch to QA staging server.
 name: "Release to QA"
 
 env:
@@ -37,13 +38,17 @@ jobs:
   determine_version:
     name: "Determine version"
     uses: ./github/workflows/compute-next-stag-version.yml
+    needs: update_branch
     with:
       tag_prefix: ${{ env.vcs_tag_prefix }}
 
   deploy:
     name: "Deploy to QA"
     uses: ./.github/workflows/release.yml
     needs: determine_version
+    environment:
+      name: "qa_deploy"
+      url: "https://qa.scriptureforge.org"
     with:
       dotnet_version: "8.0.x"
       node_version: "18.20.2"
@@ -59,15 +64,15 @@ jobs:
       project: "SIL.XForge.Scripture"
 
     secrets:
-      deploy_server: ${{secrets.qa_deploy_server}}
-      deploy_known_hosts: ${{secrets.qa_deploy_known_hosts}}
-      deploy_ssh_private_key: ${{secrets.qa_deploy_ssh_private_key}}
-      auth_backend_secret: ${{ secrets.qa_auth_backend_secret }}
-      auth_webhook_password: ${{ secrets.qa_auth_webhook_password }}
-      paratext_client_id: ${{secrets.qa_paratext_client_id}}
-      paratext_api_token: ${{ secrets.qa_paratext_api_token }}
-      paratext_resource_password_base64: ${{ secrets.qa_paratext_resource_password_base64 }}
-      paratext_resource_password_hash: ${{ secrets.qa_paratext_resource_password_hash }}
-      serval_client_id: ${{secrets.qa_serval_client_id}}
-      serval_client_secret: ${{ secrets.qa_serval_client_secret }}
-      serval_webhook_secret: ${{ secrets.qa_serval_webhook_secret }}
+      deploy_server: ${{secrets.deploy_server}}
+      deploy_known_hosts: ${{secrets.deploy_known_hosts}}
+      deploy_ssh_private_key: ${{secrets.deploy_ssh_private_key}}
+      auth_backend_secret: ${{ secrets.auth_backend_secret }}
+      auth_webhook_password: ${{ secrets.auth_webhook_password }}
+      paratext_client_id: ${{secrets.paratext_client_id}}
+      paratext_api_token: ${{ secrets.paratext_api_token }}
+      paratext_resource_password_base64: ${{ secrets.paratext_resource_password_base64 }}
+      paratext_resource_password_hash: ${{ secrets.paratext_resource_password_hash }}
+      serval_client_id: ${{secrets.serval_client_id}}
+      serval_client_secret: ${{ secrets.serval_client_secret }}
+      serval_webhook_secret: ${{ secrets.serval_webhook_secret }}