From 1329622947cf097421b68181d896011820ab7b48 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 10:52:49 +0200 Subject: [PATCH 01/10] ... --- .gitea/workflows/build-and-deploy-pipeline.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 3711e72..7e798a3 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -4,8 +4,7 @@ on: push: branches: - main - - kontaktformular-filter-spam - + - dev env: PROD_USER: verua.swiss From a0aa9a4ada7fb5e86ddf85edb6e9db789143f7b3 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:29:50 +0200 Subject: [PATCH 02/10] switched to development for testing --- hugo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hugo.toml b/hugo.toml index 8ae15a4..9198642 100755 --- a/hugo.toml +++ b/hugo.toml @@ -21,8 +21,8 @@ enableRobotsTXT = true ########################### Deployment ############################# [params] # set to "development" or "production". This deploys the site to the correct environment and sets the robot.txt to disallow all pages when in development mode. -environment = "production" -#environment = "development" +# environment = "production" +environment = "development" # set to true to enable captcha on the form useCaptcha = true From 2a2e67c02018de174073968ac61274e15fe86de3 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:37:40 +0200 Subject: [PATCH 03/10] Test push for new branch configuration with "github.ref" --- .gitea/workflows/build-and-deploy-pipeline.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 7e798a3..1c5a2ff 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -66,19 +66,18 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development - if: steps.read_toml.outputs.value == 'development' + - name: Deploy to Development + if: github.ref == 'refs/heads/dev' run: | - echo "Running steps for Development Environment" - echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" + echo "Deploying to Development Environment" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: steps.read_toml.outputs.value == 'production' + if: github.ref == 'refs/heads/main' run: | - echo "Running steps for Production Environment" + echo "Deploying to Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From bf40e4a0d14f64e4170db324230a6032f3ece0f1 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:39:16 +0200 Subject: [PATCH 04/10] test --- .gitea/workflows/build-and-deploy-pipeline.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 1c5a2ff..7e798a3 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -66,18 +66,19 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development - if: github.ref == 'refs/heads/dev' + - name: Deploy to Development + if: steps.read_toml.outputs.value == 'development' run: | - echo "Deploying to Development Environment" + echo "Running steps for Development Environment" + echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: github.ref == 'refs/heads/main' + if: steps.read_toml.outputs.value == 'production' run: | - echo "Deploying to Production Environment" + echo "Running steps for Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From 96488e1ef1e218bd8e72e60738428d662a768b5a Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:39:52 +0200 Subject: [PATCH 05/10] test --- .gitea/workflows/build-and-deploy-pipeline.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 7e798a3..1c5a2ff 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -66,19 +66,18 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development - if: steps.read_toml.outputs.value == 'development' + - name: Deploy to Development + if: github.ref == 'refs/heads/dev' run: | - echo "Running steps for Development Environment" - echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" + echo "Deploying to Development Environment" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: steps.read_toml.outputs.value == 'production' + if: github.ref == 'refs/heads/main' run: | - echo "Running steps for Production Environment" + echo "Deploying to Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From 7eee5534e468fa1bd631dab6ccc5a6cb0acabe1c Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:44:04 +0200 Subject: [PATCH 06/10] test --- .gitea/workflows/build-and-deploy-pipeline.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 1c5a2ff..c81a4f4 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -67,7 +67,6 @@ jobs: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - name: Deploy to Development - if: github.ref == 'refs/heads/dev' run: | echo "Deploying to Development Environment" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH @@ -75,7 +74,6 @@ jobs: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: github.ref == 'refs/heads/main' run: | echo "Deploying to Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH From 8a80a403c97656dba967ce9bb788200c4b55c574 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:45:03 +0200 Subject: [PATCH 07/10] test --- .gitea/workflows/build-and-deploy-pipeline.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index c81a4f4..7e798a3 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -66,16 +66,19 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development + - name: Deploy to Development + if: steps.read_toml.outputs.value == 'development' run: | - echo "Deploying to Development Environment" + echo "Running steps for Development Environment" + echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production + if: steps.read_toml.outputs.value == 'production' run: | - echo "Deploying to Production Environment" + echo "Running steps for Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From e02a08be86d7a7fd1e7cc5a6585c1a5db43406bc Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:46:02 +0200 Subject: [PATCH 08/10] test --- .gitea/workflows/build-and-deploy-pipeline.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 7e798a3..12921e9 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -66,19 +66,18 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development - if: steps.read_toml.outputs.value == 'development' + - name: Deploy to Development + if: gitea.ref == '/heads/dev' run: | - echo "Running steps for Development Environment" - echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" + echo "Deploying to Development Environment" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: steps.read_toml.outputs.value == 'production' + if: gitea.ref == 'refs/heads/main' run: | - echo "Running steps for Production Environment" + echo "Deploying to Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From 873b3a66d70170edd13d067bcd7de4929c1fdcb5 Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 12:48:58 +0200 Subject: [PATCH 09/10] test --- .../workflows/build-and-deploy-pipeline.yaml | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml index 12921e9..93458d8 100644 --- a/.gitea/workflows/build-and-deploy-pipeline.yaml +++ b/.gitea/workflows/build-and-deploy-pipeline.yaml @@ -22,15 +22,15 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - - name: env-toml-file - uses: SebRollen/toml-action@v1.2.0 - id: read_toml - with: - file: 'hugo.toml' - field: 'params.environment' + # - name: env-toml-file + # uses: SebRollen/toml-action@v1.2.0 + # id: read_toml + # with: + # file: 'hugo.toml' + # field: 'params.environment' - - name: Echo environment - run: echo "Environment is ${{ steps.read_toml.outputs.value }}" + # - name: Echo environment + # run: echo "Environment is ${{ steps.read_toml.outputs.value }}" - name: Set up Go uses: actions/setup-go@v5.0.0 @@ -66,18 +66,19 @@ jobs: with: ssh-private-key: ${{ secrets.VFO_SSH_KEY }} - - name: Deploy to Development - if: gitea.ref == '/heads/dev' + - name: Deploy to Development + if: github.ref == 'refs/heads/dev' run: | - echo "Deploying to Development Environment" + echo "Running steps for Development Environment" + echo "user: $DEV_USER host: $DEV_HOST path: $DEV_PATH" rsync -avz ./public/ $DEV_USER@$DEV_HOST:$DEV_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' - name: Deploy to Production - if: gitea.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' run: | - echo "Deploying to Production Environment" + echo "Running steps for Production Environment" rsync -avz ./public/ $PROD_USER@$PROD_HOST:$PROD_PATH env: RSYNC_RSH: 'ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no' From 5326c6df6ccf5afffb0d59a49d2aa82662f2565d Mon Sep 17 00:00:00 2001 From: Andreas Hnida Date: Mon, 29 Jul 2024 13:02:23 +0200 Subject: [PATCH 10/10] Removed environment variable for build dependency on pushed branch --- hugo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/hugo.toml b/hugo.toml index 9198642..2999187 100755 --- a/hugo.toml +++ b/hugo.toml @@ -20,9 +20,6 @@ enableRobotsTXT = true ########################### Deployment ############################# [params] -# set to "development" or "production". This deploys the site to the correct environment and sets the robot.txt to disallow all pages when in development mode. -# environment = "production" -environment = "development" # set to true to enable captcha on the form useCaptcha = true