Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
link2xt
2023-08-26 18:12:13 +00:00
parent 95f29f7b63 87ffcaf03e
commit 5e3b1fa540
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -25,7 +25,7 @@ jobs:
name: Lint Rust name: Lint Rust
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
RUSTUP_TOOLCHAIN: 1.71.0 RUSTUP_TOOLCHAIN: 1.72.0
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install rustfmt and clippy - name: Install rustfmt and clippy

2
python/src/deltachat/account.py
View File

@@ -427,7 +427,7 @@ class Account:
assert dc_chatlist != ffi.NULL assert dc_chatlist != ffi.NULL
chatlist = [] chatlist = []
for i in range(0, lib.dc_chatlist_get_cnt(dc_chatlist)): for i in range(lib.dc_chatlist_get_cnt(dc_chatlist)):
chat_id = lib.dc_chatlist_get_chat_id(dc_chatlist, i) chat_id = lib.dc_chatlist_get_chat_id(dc_chatlist, i)
chatlist.append(Chat(self, chat_id)) chatlist.append(Chat(self, chat_id))
return chatlist return chatlist

2
python/src/deltachat/cutil.py
View File

@@ -15,7 +15,7 @@ def as_dc_charpointer(obj):
def iter_array(dc_array_t, constructor: Callable[[int], T]) -> Generator[T, None, None]: def iter_array(dc_array_t, constructor: Callable[[int], T]) -> Generator[T, None, None]:
for i in range(0, lib.dc_array_get_cnt(dc_array_t)): for i in range(lib.dc_array_get_cnt(dc_array_t)):
yield constructor(lib.dc_array_get_id(dc_array_t, i)) yield constructor(lib.dc_array_get_id(dc_array_t, i))

2
python/tests/bench_test_setup.py
View File

@@ -15,6 +15,6 @@ class TestEmpty:
def test_prepare_setup_measurings(self, acfactory): def test_prepare_setup_measurings(self, acfactory):
acfactory.get_online_accounts(BENCH_NUM) acfactory.get_online_accounts(BENCH_NUM)
@pytest.mark.parametrize("num", range(0, BENCH_NUM + 1)) @pytest.mark.parametrize("num", range(BENCH_NUM + 1))
def test_setup_online_accounts(self, acfactory, num): def test_setup_online_accounts(self, acfactory, num):
acfactory.get_online_accounts(num) acfactory.get_online_accounts(num)

2
scripts/coredeps/install-rust.sh
View File

@@ -7,7 +7,7 @@ set -euo pipefail
# #
# Avoid using rustup here as it depends on reading /proc/self/exe and # Avoid using rustup here as it depends on reading /proc/self/exe and
# has problems running under QEMU. # has problems running under QEMU.
RUST_VERSION=1.68.0 RUST_VERSION=1.72.0
ARCH="$(uname -m)" ARCH="$(uname -m)"
test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

2
scripts/zig-musl-check.sh
View File

@@ -9,7 +9,7 @@ set -e
unset RUSTFLAGS unset RUSTFLAGS
# Pin Rust version to avoid uncontrolled changes in the compiler and linker flags. # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
export RUSTUP_TOOLCHAIN=1.71.0 export RUSTUP_TOOLCHAIN=1.72.0
ZIG_VERSION=0.11.0 ZIG_VERSION=0.11.0

2
scripts/zig-rpc-server.sh
View File

@@ -8,7 +8,7 @@ set -e
unset RUSTFLAGS unset RUSTFLAGS
# Pin Rust version to avoid uncontrolled changes in the compiler and linker flags. # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
export RUSTUP_TOOLCHAIN=1.71.0 export RUSTUP_TOOLCHAIN=1.72.0
ZIG_VERSION=0.11.0 ZIG_VERSION=0.11.0