diff --git a/.gitea/workflows/build_and_deploy.yaml b/.gitea/workflows/build_and_deploy.yaml index 6e94f47..ed13ef5 100644 --- a/.gitea/workflows/build_and_deploy.yaml +++ b/.gitea/workflows/build_and_deploy.yaml @@ -8,7 +8,6 @@ on: env: ZOLA_VERSION: "0.19.2" HOST: ${{ secrets.SERVER_IP }} - SSH_REPO_USERNAME: ${{ secrets.REPO_USERNAME }} SSH_DEPLOY_USERNAME: ${{ secrets.DEPLOY_USERNAME }} SSH_REPO_KEY: ${{ secrets.SSH_REPO_KEY }} SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} @@ -21,25 +20,8 @@ jobs: image: git.0x45.cz/em/mixtape:240904 steps: - - name: Configure SSH - run: | - mkdir -p ~/.ssh - echo "${SSH_REPO_KEY}" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H "git.filiprojek.cz" >> ~/.ssh/known_hosts - - # Create SSH config - cat < ~/.ssh/config - Host git.filiprojek.cz - HostName git.filiprojek.cz - User git - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes - EOF - chmod 600 ~/.ssh/config - - name: Checkout repository - run: git clone git@git.filiprojek.cz:fr/guitar.git /workspace/fr/guitar + run: git clone https://git.filiprojek.cz/fr/guitar.git /workspace/fr/guitar - name: Build Chordpro run: make pdf html songbook @@ -53,5 +35,5 @@ jobs: echo "${SSH_DEPLOY_KEY}" | ssh-add - mkdir -p ~/.ssh/ ssh-keyscan -H "${HOST}" >> ~/.ssh/known_hosts - rsync -r --delete-after public/* "${SSH_DEPLOY_USERNAME}@${HOST}:${DEST_FOLDER}" + rsync -ra --delete-after public/* "${SSH_DEPLOY_USERNAME}@${HOST}:${DEST_FOLDER}"