Skip to content

Commit b456bb8

Browse files
Update CI configuration to upgrade pip and install PGroonga extension
- Added a step to upgrade pip to the latest version to avoid warnings about outdated pip. - Added steps to install the PGroonga extension and restart PostgreSQL to ensure the schema exists. This resolves issues with the outdated pip version and the missing PGroonga schema during the CI process.
1 parent 1666a0c commit b456bb8

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

Diff for: .github/workflows/zulip-ci.yml

+10
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,22 @@ jobs:
6767
ref: ${{ matrix.server_version }}
6868
path: server
6969

70+
- name: Upgrade pip
71+
run: |
72+
python -m pip install --upgrade pip
73+
7074
- name: Install dependencies
7175
run: |
7276
cd server
7377
# This is the main setup job for the test suite
7478
./tools/ci/setup-backend --skip-dev-db-build
7579
80+
# Install PGroonga extension
81+
sudo sh -c 'echo "deb http://packages.groonga.org/debian/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/groonga.list'
82+
sudo apt-get update
83+
sudo apt-get install -y postgresql-14-pgroonga
84+
sudo service postgresql restart
85+
7686
# Cleaning caches is mostly unnecessary in GitHub Actions, because
7787
# most builds don't get to write to the cache.
7888
# scripts/lib/clean_unused_caches.py --verbose --threshold 0

Diff for: zulip/integrations/google/google-calendar

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import time
1212
from typing import List, Optional, Set, Tuple
1313

1414
import dateutil.parser
15-
import httplib2
1615
import pytz
1716
from google.oauth2.credentials import Credentials
1817
from google_auth_oauthlib.flow import InstalledAppFlow
@@ -111,8 +110,7 @@ def get_credentials() -> Credentials:
111110
# Save the credentials for the next run
112111
with open(credential_path, "w") as token:
113112
token.write(credentials.to_json())
114-
115-
return credentials
113+
return credentials
116114
except FileNotFoundError:
117115
logging.exception("Error while trying to open the `google-credentials.json` file.")
118116
sys.exit(1)

Diff for: zulip/integrations/google/requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
httplib2>=0.22.0
21
google-auth>=2.0.0
32
google-auth-oauthlib>=0.4.6
43
google-api-python-client>=2.0.0
4+
types-google-auth==2.0.0
5+
types-google-auth-oauthlib==0.4.6

0 commit comments

Comments
 (0)