From bb9a3d4b8ec4ebaffc3dd7bdb5a7e35629f3f1ed Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Thu, 16 Feb 2023 09:00:27 +0100 Subject: [PATCH] more bug hunting: disable most ci, point to branch --- .github/workflows/ci.yml | 92 +++++++++---------- .github/workflows/dependabot.yml | 2 +- .../workflows/jsonrpc-client-npm-package.yml | 12 +-- .github/workflows/jsonrpc.yml | 10 +- .github/workflows/node-delete-preview.yml | 6 +- .github/workflows/node-docs.yml | 8 +- .github/workflows/node-package.yml | 12 +-- .github/workflows/node-tests.yml | 14 +-- .github/workflows/upload-docs.yml | 10 +- .github/workflows/upload-ffi-docs.yml | 10 +- Cargo.lock | 2 +- Cargo.toml | 2 +- 12 files changed, 90 insertions(+), 90 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4000e7296..4341078c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,58 +84,58 @@ jobs: - name: Tests run: cargo test --workspace - - name: Test cargo vendor - run: cargo vendor + # - name: Test cargo vendor + # run: cargo vendor - - name: Install python - if: ${{ matrix.python }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} + # - name: Install python + # if: ${{ matrix.python }} + # uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python }} - - name: Install tox - if: ${{ matrix.python }} - run: pip install tox + # - name: Install tox + # if: ${{ matrix.python }} + # run: pip install tox - - name: Build C library - if: ${{ matrix.python }} - run: cargo build -p deltachat_ffi --features jsonrpc + # - name: Build C library + # if: ${{ matrix.python }} + # run: cargo build -p deltachat_ffi --features jsonrpc - - name: Run python tests - if: ${{ matrix.python }} - env: - DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} - DCC_RS_TARGET: debug - DCC_RS_DEV: ${{ github.workspace }} - working-directory: python - run: tox -e lint,mypy,doc,py3 + # - name: Run python tests + # if: ${{ matrix.python }} + # env: + # DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} + # DCC_RS_TARGET: debug + # DCC_RS_DEV: ${{ github.workspace }} + # working-directory: python + # run: tox -e lint,mypy,doc,py3 - - name: Build deltachat-rpc-server - if: ${{ matrix.python }} - run: cargo build -p deltachat-rpc-server + # - name: Build deltachat-rpc-server + # if: ${{ matrix.python }} + # run: cargo build -p deltachat-rpc-server - - name: Add deltachat-rpc-server to path - if: ${{ matrix.python }} - run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH + # - name: Add deltachat-rpc-server to path + # if: ${{ matrix.python }} + # run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH - - name: Run deltachat-rpc-client tests - if: ${{ matrix.python }} - env: - DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} - working-directory: deltachat-rpc-client - run: tox -e py3,lint + # - name: Run deltachat-rpc-client tests + # if: ${{ matrix.python }} + # env: + # DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} + # working-directory: deltachat-rpc-client + # run: tox -e py3,lint - - name: Install pypy - if: ${{ matrix.python }} - uses: actions/setup-python@v4 - with: - python-version: 'pypy${{ matrix.python }}' + # - name: Install pypy + # if: ${{ matrix.python }} + # uses: actions/setup-python@v4 + # with: + # python-version: 'pypy${{ matrix.python }}' - - name: Run pypy tests - if: ${{ matrix.python }} - env: - DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} - DCC_RS_TARGET: debug - DCC_RS_DEV: ${{ github.workspace }} - working-directory: python - run: tox -e pypy3 + # - name: Run pypy tests + # if: ${{ matrix.python }} + # env: + # DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }} + # DCC_RS_TARGET: debug + # DCC_RS_DEV: ${{ github.workspace }} + # working-directory: python + # run: tox -e pypy3 diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 174f6096e..426d0a4db 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -1,5 +1,5 @@ name: Dependabot auto-approve -on: pull_request +# on: pull_request permissions: pull-requests: write diff --git a/.github/workflows/jsonrpc-client-npm-package.yml b/.github/workflows/jsonrpc-client-npm-package.yml index a1c3b4b82..e4577e60b 100644 --- a/.github/workflows/jsonrpc-client-npm-package.yml +++ b/.github/workflows/jsonrpc-client-npm-package.yml @@ -1,10 +1,10 @@ name: 'jsonrpc js client build' -on: - pull_request: - push: - tags: - - '*' - - '!py-*' +# on: +# pull_request: +# push: +# tags: +# - '*' +# - '!py-*' jobs: diff --git a/.github/workflows/jsonrpc.yml b/.github/workflows/jsonrpc.yml index de05f50d6..b422a01b7 100644 --- a/.github/workflows/jsonrpc.yml +++ b/.github/workflows/jsonrpc.yml @@ -1,10 +1,10 @@ name: JSON-RPC API Test -on: - push: - branches: [master] - pull_request: - branches: [master] +# on: +# push: +# branches: [master] +# pull_request: +# branches: [master] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/node-delete-preview.yml b/.github/workflows/node-delete-preview.yml index ba698c846..7a67b4448 100644 --- a/.github/workflows/node-delete-preview.yml +++ b/.github/workflows/node-delete-preview.yml @@ -1,9 +1,9 @@ # documentation: https://github.com/deltachat/sysadmin/tree/master/download.delta.chat name: Delete node PR previews -on: - pull_request: - types: [closed] +# on: +# pull_request: +# types: [closed] jobs: delete: diff --git a/.github/workflows/node-docs.yml b/.github/workflows/node-docs.yml index a7c07e0d9..2d790e046 100644 --- a/.github/workflows/node-docs.yml +++ b/.github/workflows/node-docs.yml @@ -1,9 +1,9 @@ name: Generate & upload node.js documentation -on: - push: - branches: - - master +# on: +# push: +# branches: +# - master jobs: generate: diff --git a/.github/workflows/node-package.yml b/.github/workflows/node-package.yml index f0cb1cc09..fd1ba6ff1 100644 --- a/.github/workflows/node-package.yml +++ b/.github/workflows/node-package.yml @@ -1,10 +1,10 @@ name: 'node.js build' -on: - pull_request: - push: - tags: - - '*' - - '!py-*' +# on: +# pull_request: +# push: +# tags: +# - '*' +# - '!py-*' jobs: diff --git a/.github/workflows/node-tests.yml b/.github/workflows/node-tests.yml index e0d557d42..7f59c2805 100644 --- a/.github/workflows/node-tests.yml +++ b/.github/workflows/node-tests.yml @@ -1,11 +1,11 @@ name: 'node.js tests' -on: - pull_request: - push: - branches: - - master - - staging - - trying +# on: +# pull_request: +# push: +# branches: +# - master +# - staging +# - trying jobs: tests: diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index c624cb081..3c7d7a31f 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -1,10 +1,10 @@ name: Build & Deploy Documentation on rs.delta.chat -on: - push: - branches: - - master - - docs-gh-action +# on: +# push: +# branches: +# - master +# - docs-gh-action jobs: build: diff --git a/.github/workflows/upload-ffi-docs.yml b/.github/workflows/upload-ffi-docs.yml index 73fa07cb1..1c7facf67 100644 --- a/.github/workflows/upload-ffi-docs.yml +++ b/.github/workflows/upload-ffi-docs.yml @@ -1,10 +1,10 @@ name: Build & Deploy Documentation on cffi.delta.chat -on: - push: - branches: - - master - - docs-gh-action +# on: +# push: +# branches: +# - master +# - docs-gh-action jobs: build: diff --git a/Cargo.lock b/Cargo.lock index a0c93e2af..73eb91e26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3775,7 +3775,7 @@ dependencies = [ [[package]] name = "sendme" version = "0.1.0" -source = "git+https://github.com/n0-computer/sendme?branch=main#2edb528007dd773e7f00fd4dd460506c8abf1681" +source = "git+https://github.com/n0-computer/sendme?branch=flub/debug-ci#fc368a5b3070029488c0380c37eec1fc92f972eb" dependencies = [ "abao", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 62fc9b73a..1e7a14788 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ regex = "1.7" rusqlite = { version = "0.27", features = ["sqlcipher"] } rust-hsluv = "0.1" sanitize-filename = "0.4" -sendme = { git = "https://github.com/n0-computer/sendme", branch = "main", default-features = false } +sendme = { git = "https://github.com/n0-computer/sendme", branch = "flub/debug-ci", default-features = false } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } sha-1 = "0.10"