From e8f3450154b12694fc981a0d73adeb8db555740a Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sat, 9 Sep 2023 13:41:25 +0200
Subject: [PATCH 1/4] Use new live environment name use vars instead of secrets
 for configuration vars vars have been added to github repo bump checkout
 action to v4

---
 .github/workflows/build_deploy.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index 93679917d..660598697 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -8,9 +8,11 @@ on:
 jobs:
   build_deploy:
     runs-on: ubuntu-latest
-    environment: main
+    environment: 
+      name: training.plone.org
+      url: https://training.plone.org
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -47,9 +49,9 @@ jobs:
         with:
           flags: "-avzr --delete"
           options: ""
-          ssh_options: "-p ${{secrets.DEPLOY_PORT}}"
+          ssh_options: "-p ${{vars.DEPLOY_PORT_TRAINING}}"
           src: "_build/html/"
-          dest: "${{secrets.DEPLOY_USER_TRAINING}}@${{secrets.DEPLOY_SERVER_TRAINING}}:${{secrets.DEPLOY_PATH_TRAINING}}"
+          dest: "${{vars.DEPLOY_USER_TRAINING}}@${{vars.DEPLOY_SERVER_TRAINING}}:${vars.DEPLOY_PATH_TRAINING}}"
 
       - name: Display status from deploy
         run: echo "${{ steps.deploy.outputs.status }}"

From cffcbacb4ea9afcfb181c68559075f7332cd4169 Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sat, 9 Sep 2023 13:46:06 +0200
Subject: [PATCH 2/4] allow manual workflow run

---
 .github/workflows/build_deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index 660598697..6825f711c 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+    workflow_dispatch:
 
 jobs:
   build_deploy:

From ec7809044941a72baed6074a0cd8ad947908bda9 Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sat, 9 Sep 2023 13:55:32 +0200
Subject: [PATCH 3/4] fix accolade in path substitution

---
 .github/workflows/build_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index 6825f711c..eec4eb568 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -52,7 +52,7 @@ jobs:
           options: ""
           ssh_options: "-p ${{vars.DEPLOY_PORT_TRAINING}}"
           src: "_build/html/"
-          dest: "${{vars.DEPLOY_USER_TRAINING}}@${{vars.DEPLOY_SERVER_TRAINING}}:${vars.DEPLOY_PATH_TRAINING}}"
+          dest: "${{vars.DEPLOY_USER_TRAINING}}@${{vars.DEPLOY_SERVER_TRAINING}}:${{vars.DEPLOY_PATH_TRAINING}}"
 
       - name: Display status from deploy
         run: echo "${{ steps.deploy.outputs.status }}"

From 6c8ca080790caa34337f48c2a12d3684ce4e2338 Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sat, 9 Sep 2023 14:04:06 +0200
Subject: [PATCH 4/4] shorten workflow title

---
 .github/workflows/build_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index eec4eb568..e36259a19 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -1,4 +1,4 @@
-name: Build and deploy training documentation to training.plone.org
+name: build/deploy training.plone.org
 
 on:
   push: