diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 222ab8b..bcf367c 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,7 +14,9 @@ on: jobs: deploy: - runs-on: raspberry-pi + # 'linux' = elke vrije runner. Geen runner-specifieke aannames in deze job (zie de + # installatiestap hieronder); valt dit ooit om, zet het dan terug op 'raspberry-pi'. + runs-on: linux steps: - name: Download build artifact uses: actions/download-artifact@v3 @@ -51,7 +53,13 @@ jobs: PI_MAIN_USERNAME: ${{ secrets.PI_MAIN_USERNAME }} PI_MAIN_ADDRESS: ${{ secrets.PI_MAIN_ADDRESS }} run: | - sudo apt-get update && sudo apt-get install -y sshpass + # Runner-onafhankelijk: werkt op elke Linux-runner (Pi of pc, arm64 of x64, host of + # container, met of zonder sudo). Tools worden alleen geinstalleerd als ze ontbreken. + SUDO="" + if [ "$(id -u)" -ne 0 ] && command -v sudo >/dev/null 2>&1; then SUDO="sudo"; fi + if ! command -v sshpass >/dev/null 2>&1 || ! command -v scp >/dev/null 2>&1; then + $SUDO apt-get update && $SUDO apt-get install -y sshpass openssh-client + fi sshpass -e scp \ -P "$PI_MAIN_PORT" \ -o StrictHostKeyChecking=no \