From 6b13fbf0805cbc6d4f57d833e60d4d8c7216ec79 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 23 May 2024 21:38:45 +0200 Subject: [PATCH 1/4] Fix deploy condition Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index b14aff8..12de8d7 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -45,13 +45,14 @@ jobs: jekyll build --verbose - name: Prepare ssh key id: prepare_ssh_key - if: ${{ github.ref == 'main' }} + #if: ${{ gitea.ref == 'main' }} run: | + echo "Git refs = ${{ gitea.ref }} and ${{ github_ref }}" echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - name: Publish Jekyll site id: publish_site - if: ${{ github.ref == 'main' }} + if: ${{ gitea.ref == 'main' }} run: | rsync -halvi \ -e "ssh -a -x -o StrictHostKeyChecking=no" \ -- 2.44.1 From ae076ccfe088dde15c6c07572ea61a710031936a Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 23 May 2024 21:51:03 +0200 Subject: [PATCH 2/4] Test some output Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index 12de8d7..f941df4 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -45,9 +45,8 @@ jobs: jekyll build --verbose - name: Prepare ssh key id: prepare_ssh_key - #if: ${{ gitea.ref == 'main' }} + if: ${{ gitea.ref == 'main' }} run: | - echo "Git refs = ${{ gitea.ref }} and ${{ github_ref }}" echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - name: Publish Jekyll site @@ -57,3 +56,7 @@ jobs: rsync -halvi \ -e "ssh -a -x -o StrictHostKeyChecking=no" \ ./_site/ www@lafs.eval.latfa.net:/var/www/site/ + - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" + - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." + - run: echo "🍏 This job's status is ${{ job.status }}." -- 2.44.1 From 5ae5fdf6cd0abc8a9fe9344e5d48dfa79c2bd159 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 23 May 2024 21:55:20 +0200 Subject: [PATCH 3/4] Check before Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index f941df4..38f5821 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -12,6 +12,13 @@ jobs: jekyll: runs-on: ubuntu-22.04 steps: + - name: Check environment + id: check_environment + run: | + echo "The job was automatically triggered by a ${{ gitea.event_name }} event." + echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!" + echo "The name of your branch is ${{ github.ref }} and your repository is ${{ gitea.repository }}." + echo "This job's status is ${{ job.status }}." - name: Check out repository id: checkout uses: actions/checkout@v4 @@ -56,7 +63,3 @@ jobs: rsync -halvi \ -e "ssh -a -x -o StrictHostKeyChecking=no" \ ./_site/ www@lafs.eval.latfa.net:/var/www/site/ - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - run: echo "🍏 This job's status is ${{ job.status }}." -- 2.44.1 From 57405750f63b859c252fa8fdc3d29524e514ffb5 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 23 May 2024 22:00:19 +0200 Subject: [PATCH 4/4] Fix the condition Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index 38f5821..4d2a977 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -12,13 +12,6 @@ jobs: jekyll: runs-on: ubuntu-22.04 steps: - - name: Check environment - id: check_environment - run: | - echo "The job was automatically triggered by a ${{ gitea.event_name }} event." - echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!" - echo "The name of your branch is ${{ github.ref }} and your repository is ${{ gitea.repository }}." - echo "This job's status is ${{ job.status }}." - name: Check out repository id: checkout uses: actions/checkout@v4 @@ -52,13 +45,13 @@ jobs: jekyll build --verbose - name: Prepare ssh key id: prepare_ssh_key - if: ${{ gitea.ref == 'main' }} + if: ${{ gitea.ref == 'refs/heads/main' }} run: | echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - name: Publish Jekyll site id: publish_site - if: ${{ gitea.ref == 'main' }} + if: ${{ gitea.ref == 'refs/heads/main' }} run: | rsync -halvi \ -e "ssh -a -x -o StrictHostKeyChecking=no" \ -- 2.44.1