From 23dbdd11edd2887783290260e71304aebde65a8f Mon Sep 17 00:00:00 2001 From: ctmbl Date: Mon, 17 Jun 2024 22:14:57 +0200 Subject: [PATCH] Revert "TO REVERT: test workflows version update" This reverts commit d1dba92851fb8a7385ee4ca7913ee36fcdaa766b. --- .github/workflows/build_and_deploy.yml | 16 ++++++++-------- TO_DELETE | 0 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 TO_DELETE diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 609331f..e5fa1e5 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -60,7 +60,7 @@ jobs: # If for any reason you want to trigger this step on your fork remove the following line, # trigger manually or open an issue https://github.com/iScsc/blog.iscsc.fr/issues, # we'll find a better way to skip this step. - # if: ${{ (github.event_name == 'push' && ! github.event.repository.fork) || github.event_name == 'workflow_dispatch' }} + if: ${{ (github.event_name == 'push' && ! github.event.repository.fork) || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest steps: - name: 🛠️ Setup build directory @@ -88,7 +88,7 @@ jobs: # Upload the build to the remote server location: the volume shared by the nginx container serving http requests - name: 🚀 Upload run: | - ls -l ./build/blog/prod + rsync --archive --stats --verbose --delete ./build/blog/prod/* ${{ secrets.CI_USER_NAME }}@iscsc.fr:${{ secrets.REPO_PATH_ON_REMOTE }}/build/blog/prod - name: ⏬ Remote git pull run: | @@ -97,8 +97,8 @@ jobs: # Finally notify of the new article (if any) on the iScsc discord server # action jitterbit/get-changed-files@v1 doesn't support 'workflow_dispatch' events: https://github.com/jitterbit/get-changed-files/issues/38 notify: - # needs: [deploy] - # if: ${{ github.event_name != 'workflow_dispatch' }} + needs: [deploy] + if: ${{ github.event_name != 'workflow_dispatch' }} runs-on: ubuntu-latest steps: # Checkout repo, no need to checkout submodule @@ -125,7 +125,7 @@ jobs: echo "${{ steps.files.outputs.modified }}" echo "Added+Modified:" echo "${{ steps.files.outputs.added_modified }}" - # - name: 📨 Notify on Discord - # run: | - # python3 -m pip install requests PyYAML - # python3 ./scripts/new_article.py ${{ steps.files.outputs.added }} + - name: 📨 Notify on Discord + run: | + python3 -m pip install requests PyYAML + python3 ./scripts/new_article.py ${{ steps.files.outputs.added }} diff --git a/TO_DELETE b/TO_DELETE deleted file mode 100644 index e69de29..0000000