From 341ffc9a55300413a1805767f3e1103872f83ce2 Mon Sep 17 00:00:00 2001
From: thomas girod <thgirod@hotmail.com>
Date: Mon, 2 Sep 2024 12:42:27 +0200
Subject: [PATCH] update CI

---
 .github/actions/setup_project/action.yml | 6 +++---
 .github/workflows/deploy.yml             | 3 ++-
 .github/workflows/deploy_docs.yml        | 2 +-
 .github/workflows/taiste.yml             | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup_project/action.yml b/.github/actions/setup_project/action.yml
index 975dbde9..dc7de948 100644
--- a/.github/actions/setup_project/action.yml
+++ b/.github/actions/setup_project/action.yml
@@ -16,16 +16,16 @@ runs:
       shell: bash
 
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.10"
+        python-version: "3.12"
 
     - name: Load cached Poetry installation
       id: cached-poetry
       uses: actions/cache@v3
       with:
         path: ~/.local
-        key: poetry-0  # increment to reset cache
+        key: poetry-1  # increment to reset cache
 
     - name: Install Poetry
       if: steps.cached-poetry.outputs.cache-hit != 'true'
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5c783a12..527e0b4b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -36,7 +36,8 @@ jobs:
           export PATH="/home/sith/.local/bin:$PATH"
           pushd ${{secrets.SITH_PATH}}
 
-          git pull
+          git fetch
+          git reset --hard origin/master
           poetry install --with prod --without docs,tests
           poetry run ./manage.py install_xapian
           poetry run ./manage.py migrate
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index 16adb95a..38d9cf97 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup_project
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
       - uses: actions/cache@v3
diff --git a/.github/workflows/taiste.yml b/.github/workflows/taiste.yml
index bf0da234..f84183e3 100644
--- a/.github/workflows/taiste.yml
+++ b/.github/workflows/taiste.yml
@@ -35,7 +35,8 @@ jobs:
           export PATH="$HOME/.poetry/bin:$PATH"
           pushd ${{secrets.SITH_PATH}}
 
-          git pull
+          git fetch
+          git reset --hard origin/taiste
           poetry install --with prod --without docs,tests
           poetry run ./manage.py install_xapian
           poetry run ./manage.py migrate