From 5014b0a9cb94a79df5d3c4f56e99e96dbe45f80d Mon Sep 17 00:00:00 2001 From: missytake Date: Thu, 3 Mar 2022 18:11:55 +0100 Subject: [PATCH 1/7] GitHub Action to build & upload the rust documentation --- .github/workflows/upload-docs.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/upload-docs.yml diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml new file mode 100644 index 000000000..ab893db2f --- /dev/null +++ b/.github/workflows/upload-docs.yml @@ -0,0 +1,28 @@ +name: Build & Deploy Documentation on rs.delta.chat + +on: + push: + branches: + - master + - docs-gh-action + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Build the site in the jekyll/builder container + run: | + cargo doc + - name: Upload + uses: horochx/deploy-via-scp@v1.0.1 + with: + user: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + host: "delta.chat" + port: 22 + local: "target/doc/" + remote: "/var/www/html/rs/" + From 987504767413cd3971ffcf6df0d5cd49728b8597 Mon Sep 17 00:00:00 2001 From: missytake Date: Fri, 4 Mar 2022 01:31:00 +0100 Subject: [PATCH 2/7] docs github action: scp -> rsync --- .github/workflows/upload-docs.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index ab893db2f..3af3e9772 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -17,12 +17,11 @@ jobs: run: | cargo doc - name: Upload - uses: horochx/deploy-via-scp@v1.0.1 + uses: up9cloud/action-rsync@v1.3 with: - user: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - host: "delta.chat" - port: 22 - local: "target/doc/" - remote: "/var/www/html/rs/" + USER: ${{ secrets.USERNAME }} + KEY: ${{ secrets.KEY }} + HOST: "delta.chat" + SOURCE: "target/doc/" + TARGET: "/var/www/html/rs/" From 78429492f1d56102a15370c8c66316a8d609cb6c Mon Sep 17 00:00:00 2001 From: missytake Date: Fri, 4 Mar 2022 01:45:05 +0100 Subject: [PATCH 3/7] fix: pass arguments to rsync github action --- .github/workflows/upload-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index 3af3e9772..a57e65d3c 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -18,7 +18,7 @@ jobs: cargo doc - name: Upload uses: up9cloud/action-rsync@v1.3 - with: + env: USER: ${{ secrets.USERNAME }} KEY: ${{ secrets.KEY }} HOST: "delta.chat" From 379cb1b2e0e03655db48bfcd46fe1d852b53cf24 Mon Sep 17 00:00:00 2001 From: missytake Date: Fri, 4 Mar 2022 01:58:33 +0100 Subject: [PATCH 4/7] remove trailing slash, so it doesn't just copy the content of doc/ --- .github/workflows/upload-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index a57e65d3c..3fd1d4f42 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -22,6 +22,6 @@ jobs: USER: ${{ secrets.USERNAME }} KEY: ${{ secrets.KEY }} HOST: "delta.chat" - SOURCE: "target/doc/" + SOURCE: "target/doc" TARGET: "/var/www/html/rs/" From b586d3bb0ed0b61954deaa315cc79889aab9a3c7 Mon Sep 17 00:00:00 2001 From: missytake Date: Sun, 6 Mar 2022 09:43:39 +0100 Subject: [PATCH 5/7] only build docs for deltachat crate --- .github/workflows/upload-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index 3fd1d4f42..9bb6c82ec 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v1 - name: Build the site in the jekyll/builder container run: | - cargo doc + cargo doc --package deltachat --no-deps - name: Upload uses: up9cloud/action-rsync@v1.3 env: From b436c2761a0ebf1b30e117ca34b3070b5bdee6a9 Mon Sep 17 00:00:00 2001 From: missytake Date: Sun, 6 Mar 2022 09:59:32 +0100 Subject: [PATCH 6/7] GitHub Action to build & upload the CFFI documentation --- .github/workflows/upload-ffi-docs.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/upload-ffi-docs.yml diff --git a/.github/workflows/upload-ffi-docs.yml b/.github/workflows/upload-ffi-docs.yml new file mode 100644 index 000000000..dce6c9131 --- /dev/null +++ b/.github/workflows/upload-ffi-docs.yml @@ -0,0 +1,27 @@ +name: Build & Deploy Documentation on cffi.delta.chat + +on: + push: + branches: + - master + - docs-gh-action + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Build the site in the jekyll/builder container + run: | + cargo doc --package deltachat_ffi --no-deps + - name: Upload + uses: up9cloud/action-rsync@v1.3 + env: + USER: ${{ secrets.USERNAME }} + KEY: ${{ secrets.KEY }} + HOST: "delta.chat" + SOURCE: "target/doc" + TARGET: "/var/www/html/cffi/" + From 3ce7f45503b003c7b5116a07e045a92baeca2558 Mon Sep 17 00:00:00 2001 From: missytake Date: Sun, 6 Mar 2022 13:28:06 +0100 Subject: [PATCH 7/7] use rust toolchain of deltachat-core-rust --- .github/workflows/upload-docs.yml | 5 +++-- .github/workflows/upload-ffi-docs.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index 9bb6c82ec..e3bd897d4 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -13,10 +13,11 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Build the site in the jekyll/builder container + - uses: actions-rs/toolchain@v1 + - name: Build the documentation with cargo run: | cargo doc --package deltachat --no-deps - - name: Upload + - name: Upload to rs.delta.chat uses: up9cloud/action-rsync@v1.3 env: USER: ${{ secrets.USERNAME }} diff --git a/.github/workflows/upload-ffi-docs.yml b/.github/workflows/upload-ffi-docs.yml index dce6c9131..28d5d92d3 100644 --- a/.github/workflows/upload-ffi-docs.yml +++ b/.github/workflows/upload-ffi-docs.yml @@ -13,10 +13,11 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Build the site in the jekyll/builder container + - uses: actions-rs/toolchain@v1 + - name: Build the documentation with cargo run: | cargo doc --package deltachat_ffi --no-deps - - name: Upload + - name: Upload to cffi.delta.chat uses: up9cloud/action-rsync@v1.3 env: USER: ${{ secrets.USERNAME }}