From 4ebb7fade8ca77293d7895e22084487a0d31eda7 Mon Sep 17 00:00:00 2001 From: missytake Date: Tue, 7 Jul 2026 15:52:15 +0200 Subject: [PATCH 1/2] ci: rrsync prepends the restricted upload path, we need to leave it out --- .github/workflows/upload-docs.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index 0f69eebfe0..2dca7e021a 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -27,7 +27,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.RS_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:/var/www/html/rs.delta.chat/" + rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/* "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:" build-python: runs-on: ubuntu-latest @@ -49,7 +49,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.PY_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:/var/www/html/py.delta.chat" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/* "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:" build-c: runs-on: ubuntu-latest @@ -71,7 +71,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.C_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:/var/www/html/c.delta.chat" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/* "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:" build-ts: runs-on: ubuntu-latest @@ -104,7 +104,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.JS_JSONRPC_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:/var/www/html/js.jsonrpc.delta.chat/" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/* "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:" build-cffi: runs-on: ubuntu-latest @@ -125,4 +125,4 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.CFFI_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:/var/www/html/cffi.delta.chat/" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/* "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:" From cc6cb6ac8ab0d18787bc0ef7aa4cb09f824fc0b4 Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 8 Jul 2026 14:32:52 +0200 Subject: [PATCH 2/2] ci: just adding the trailing slash to rsync source prevents creating a directory Co-authored-by: j4n --- .github/workflows/upload-docs.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index 2dca7e021a..6b3e3c058e 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -27,7 +27,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.RS_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/* "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:" + rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:" build-python: runs-on: ubuntu-latest @@ -49,7 +49,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.PY_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/* "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:" build-c: runs-on: ubuntu-latest @@ -71,7 +71,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.C_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/* "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:" build-ts: runs-on: ubuntu-latest @@ -104,7 +104,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.JS_JSONRPC_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/* "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:" build-cffi: runs-on: ubuntu-latest @@ -125,4 +125,4 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.CFFI_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/* "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:"