From 1cbacf20dc4786d97145eef4556dc2e92ae201aa Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sun, 6 Aug 2023 14:39:35 -0700 Subject: [PATCH 1/3] Build Khoj Debian package on Ubuntu 20.04 to work with glibc 2.31 --- .github/workflows/build_desktop.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_desktop.yml b/.github/workflows/build_desktop.yml index 81784fe5..df2da3ea 100644 --- a/.github/workflows/build_desktop.yml +++ b/.github/workflows/build_desktop.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 extension: deb - os: macos-latest extension: dmg @@ -82,12 +82,12 @@ jobs: "dist/dmg/" - uses: ruby/setup-ruby@v1 - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' with: ruby-version: '3.0' - name: 🐧 Create Debian Package - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' shell: bash run: | # Install Debian Packager diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 641c280e..546f13f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 extension: deb - os: macos-latest extension: dmg @@ -133,11 +133,11 @@ jobs: "dist/dmg/" - uses: ruby/setup-ruby@v1 - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' with: ruby-version: '3.0' - name: 🐧 Create Debian Package - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' shell: bash env: DEBIAN_PACKAGE_VERSION: ${{ inputs.version }} From 8b41eb9f1477d23571ad28f3f42640cf7e099044 Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sun, 6 Aug 2023 21:14:46 -0700 Subject: [PATCH 2/3] Create Pypi package on Ubuntu 20.04 LTS as well --- .github/workflows/pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 845f2d62..21792f51 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -21,7 +21,7 @@ on: jobs: publish: name: Publish Python Package to PyPI - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 with: From 75c16432a450032ff425afa101c5c503aa9c530f Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sun, 6 Aug 2023 22:48:40 -0700 Subject: [PATCH 3/3] Loosen dateparser dependency to get python3.10 wheel for regex package This should reduce chances of installation errors due to regex package being built from source for python3.11 Previously, the regex dependency of dateparser = 1.1.1 didn't have a wheel for python 3.11. This would trigger building the regex package from scratch which would fail for a lot of folks --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4be3299b..100d4b69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ classifiers = [ "Topic :: Text Processing :: Linguistic", ] dependencies = [ - "dateparser == 1.1.1", + "dateparser >= 1.1.1", "defusedxml == 0.7.1", "fastapi == 0.77.1", "jinja2 == 3.1.2",