From c7a8a1a91c695c398c0de853c88038baf8be5131 Mon Sep 17 00:00:00 2001 From: imperosol Date: Tue, 15 Oct 2024 12:32:40 +0200 Subject: [PATCH] refactor CI --- .github/actions/setup_project/action.yml | 10 ++-------- .github/workflows/deploy.yml | 7 +++---- .github/workflows/taiste.yml | 7 +++---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/actions/setup_project/action.yml b/.github/actions/setup_project/action.yml index afd2ddb2..951aba32 100644 --- a/.github/actions/setup_project/action.yml +++ b/.github/actions/setup_project/action.yml @@ -6,15 +6,9 @@ runs: - name: Install apt packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gettext + packages: gettext pipx version: 1.0 # increment to reset cache - - name: Install dependencies - run: | - sudo apt update - sudo apt install gettext - shell: bash - - name: Set up python uses: actions/setup-python@v5 with: @@ -30,7 +24,7 @@ runs: - name: Install Poetry if: steps.cached-poetry.outputs.cache-hit != 'true' shell: bash - run: curl -sSL https://install.python-poetry.org | python3 - + run: pipx install poetry - name: Check pyproject.toml syntax shell: bash diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 514d2a06..141f8e53 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,7 @@ jobs: steps: - name: SSH Remote Commands - uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78 + uses: appleboy/ssh-action@v1.1.0 with: # Proxy proxy_host : ${{secrets.PROXY_HOST}} @@ -33,8 +33,7 @@ jobs: # See https://github.com/ae-utbm/sith/wiki/GitHub-Actions#deployment-action script: | - export PATH="/home/sith/.local/bin:$PATH" - pushd ${{secrets.SITH_PATH}} + cd ${{secrets.SITH_PATH}} git fetch git reset --hard origin/master @@ -42,7 +41,7 @@ jobs: npm install poetry run ./manage.py install_xapian poetry run ./manage.py migrate - poetry run ./manage.py collectstatic --clear --clear-generated --noinput + poetry run ./manage.py collectstatic --clear --noinput poetry run ./manage.py compilemessages sudo systemctl restart uwsgi diff --git a/.github/workflows/taiste.yml b/.github/workflows/taiste.yml index c6eadafc..a032924b 100644 --- a/.github/workflows/taiste.yml +++ b/.github/workflows/taiste.yml @@ -13,7 +13,7 @@ jobs: steps: - name: SSH Remote Commands - uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78 + uses: appleboy/ssh-action@v1.1.0 with: # Proxy proxy_host : ${{secrets.PROXY_HOST}} @@ -32,8 +32,7 @@ jobs: # See https://github.com/ae-utbm/sith/wiki/GitHub-Actions#deployment-action script: | - export PATH="$HOME/.poetry/bin:$PATH" - pushd ${{secrets.SITH_PATH}} + cd ${{secrets.SITH_PATH}} git fetch git reset --hard origin/taiste @@ -41,7 +40,7 @@ jobs: npm install poetry run ./manage.py install_xapian poetry run ./manage.py migrate - poetry run ./manage.py collectstatic --clear --clear-generated --noinput + poetry run ./manage.py collectstatic --clear --noinput poetry run ./manage.py compilemessages sudo systemctl restart uwsgi