Skip to content

Commit 6ccbb6c

Browse files
committed
ci: Update jobs' server versions to 8.x/9.x/10.x.
1 parent 929e71e commit 6ccbb6c

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

.github/workflows/zulip-ci.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# server release.
66
name: Zulip server CI
77

8-
on: [push, pull_request]
8+
on: [push, pull_request, workflow_dispatch]
99

1010
defaults:
1111
run:
@@ -17,30 +17,18 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
# Bullseye ships with Python 3.9.2.
21-
- docker_image: zulip/ci:bullseye
22-
name: Debian 11 (Python 3.9, backend)
23-
os: bullseye
24-
legacy_client_interface: "4"
25-
server_version: refs/tags/4.0
26-
# Ubuntu 22.04 ships with Python 3.10.6.
27-
- docker_image: zulip/ci:jammy
28-
name: Ubuntu 22.04 (Python 3.10, backend)
29-
os: jammy
30-
legacy_client_interface: "6"
31-
server_version: refs/tags/6.0
3220
# Debian 12 ships with Python 3.11.2.
3321
- docker_image: zulip/ci:bookworm
3422
name: Debian 12 (Python 3.11, backend + documentation)
3523
os: bookworm
36-
legacy_client_interface: "7"
37-
server_version: refs/tags/7.0
24+
legacy_client_interface: "10"
25+
server_version: refs/tags/10.1
3826
# Ubuntu 24.04 ships with Python 3.12.3.
3927
- docker_image: zulip/ci:noble
4028
name: Ubuntu 24.04 (Python 3.12, backend)
4129
os: noble
42-
legacy_client_interface: "8"
43-
server_version: refs/tags/8.5
30+
legacy_client_interface: "10"
31+
server_version: refs/tags/10.4
4432

4533
runs-on: ubuntu-latest
4634
name: ${{ matrix.name }} (Zulip ${{matrix.server_version}})
@@ -81,8 +69,8 @@ jobs:
8169
run: |
8270
cd server
8371
source tools/ci/activate-venv
84-
pip install ../api/zulip
85-
pip install ../api/zulip_bots
72+
pip install ../api/zulip_bots -v
73+
pip install ../api/zulip -v
8674
8775
- name: Run documentation and api tests
8876
run: |

zulip/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def version() -> str:
2323
def recur_expand(target_root: Any, dir: Any) -> Generator[Tuple[str, List[str]], None, None]:
2424
for root, _, files in os.walk(dir):
2525
paths = [os.path.join(root, f) for f in files]
26-
if len(paths):
26+
if paths:
2727
yield os.path.join(target_root, root), paths
2828

2929

@@ -35,6 +35,7 @@ def recur_expand(target_root: Any, dir: Any) -> Generator[Tuple[str, List[str]],
3535
long_description_content_type="text/markdown",
3636
author="Zulip Open Source Project",
3737
author_email="[email protected]",
38+
license="Apache-2.0",
3839
classifiers=[
3940
"Development Status :: 4 - Beta",
4041
"Environment :: Web Environment",

zulip_bots/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
long_description_content_type="text/markdown",
2626
author="Zulip Open Source Project",
2727
author_email="[email protected]",
28+
license="Apache-2.0",
2829
classifiers=[
2930
"Development Status :: 4 - Beta",
3031
"Environment :: Web Environment",

zulip_botserver/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
long_description_content_type="text/markdown",
1414
author="Zulip Open Source Project",
1515
author_email="[email protected]",
16+
license="Apache-2.0",
1617
classifiers=[
1718
"Development Status :: 4 - Beta",
1819
"Environment :: Web Environment",

0 commit comments

Comments
 (0)