diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6bd6b921..38e5f3902 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: tests: - runs-on: buildjet-16vcpu-ubuntu-2204 + runs-on: buildjet-4vcpu-ubuntu-2204 defaults: run: working-directory: pgml-extension diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 7d0825917..b0f9794dd 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -13,11 +13,8 @@ jobs: strategy: fail-fast: false # Let the other job finish matrix: - os: ["buildjet-16vcpu-ubuntu-2204", "buildjet-16vcpu-ubuntu-2204-arm"] + os: ["buildjet-4vcpu-ubuntu-2204", "buildjet-8vcpu-ubuntu-2204-arm"] runs-on: ${{ matrix.os }} - defaults: - run: - working-directory: pgml-extension steps: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 @@ -28,6 +25,16 @@ jobs: with: working-directory: pgml-extension command: version + - name: Cache artifacts + uses: buildjet/cache@v3 + with: + path: pgml-extension/target + key: buildjet-pgml-extension-artifacts-1 # Change this when dependencies change + - name: Cache pgrx + uses: buildjet/cache@v3 + with: + path: ~/.cargo + key: buildjet-pgml-extension-pgrx-2 # Change this when dependencies change - name: Install dependencies env: DEBIAN_FRONTEND: noninteractive @@ -140,6 +147,7 @@ jobs: postgresml: needs: postgresml-pgml strategy: + fail-fast: false # Let the other job finish matrix: os: ["ubuntu-22.04"] runs-on: ${{ matrix.os }} @@ -183,6 +191,7 @@ jobs: - postgresml - postgresml-dashboard strategy: + fail-fast: false # Let the other job finish matrix: os: ["buildjet-4vcpu-ubuntu-2204"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/ubuntu-postgresml-python-package.yaml b/.github/workflows/ubuntu-postgresml-python-package.yaml index 1fb8ea0a7..cd539ab66 100644 --- a/.github/workflows/ubuntu-postgresml-python-package.yaml +++ b/.github/workflows/ubuntu-postgresml-python-package.yaml @@ -9,6 +9,7 @@ on: jobs: postgresml-python: strategy: + fail-fast: false # Let the other job finish matrix: os: ["buildjet-4vcpu-ubuntu-2204", "buildjet-4vcpu-ubuntu-2204-arm"] runs-on: ${{ matrix.os }} diff --git a/packages/postgresml-dashboard/build.sh b/packages/postgresml-dashboard/build.sh index 10129c510..7b7fc3c7b 100644 --- a/packages/postgresml-dashboard/build.sh +++ b/packages/postgresml-dashboard/build.sh @@ -18,6 +18,8 @@ mkdir -p "$deb_dir" cp -R ${SCRIPT_DIR}/* "$deb_dir" rm "$deb_dir/build.sh" +rm "$deb_dir/release.sh" + ( cd ${SCRIPT_DIR}/../../pgml-dashboard && \ cargo build --release && \ diff --git a/packages/postgresml-dashboard/release.sh b/packages/postgresml-dashboard/release.sh index 633ff32d1..d530dcae0 100644 --- a/packages/postgresml-dashboard/release.sh +++ b/packages/postgresml-dashboard/release.sh @@ -15,10 +15,10 @@ else export ARCH=arm64 fi -if ! which dpkg-deb; then +if ! which deb-s3; then curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem sudo gem install deb-s3-0.11.4.gem - dpkg-deb --version + deb-s3 fi function package_name() { diff --git a/packages/postgresml-python/build.sh b/packages/postgresml-python/build.sh index d80e5b44e..3d80e5298 100644 --- a/packages/postgresml-python/build.sh +++ b/packages/postgresml-python/build.sh @@ -21,6 +21,7 @@ mkdir -p "$deb_dir" cp -R ${SCRIPT_DIR}/* "$deb_dir" rm "$deb_dir/build.sh" +rm "$deb_dir/release.sh" (cat ${SCRIPT_DIR}/DEBIAN/control | envsubst) > "$deb_dir/DEBIAN/control" (cat ${SCRIPT_DIR}/DEBIAN/postinst | envsubst '${PGVERSION}') > "$deb_dir/DEBIAN/postinst" diff --git a/packages/postgresml-python/release.sh b/packages/postgresml-python/release.sh index cf6b779f4..8409d158a 100644 --- a/packages/postgresml-python/release.sh +++ b/packages/postgresml-python/release.sh @@ -16,10 +16,10 @@ if [[ -z "$package_version" ]]; then exit 1 fi -if ! which dpkg-deb; then +if ! which deb-s3; then curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem sudo gem install deb-s3-0.11.4.gem - dpkg-deb --version + deb-s3 fi sudo apt install python3-pip python3 python3-virtualenv -y diff --git a/packages/postgresml/build.sh b/packages/postgresml/build.sh index 10fe4dc7f..3566c6ace 100644 --- a/packages/postgresml/build.sh +++ b/packages/postgresml/build.sh @@ -13,6 +13,7 @@ mkdir -p "$deb_dir" cp -R ${SCRIPT_DIR}/* "$deb_dir" rm "$deb_dir/build.sh" +rm "$deb_dir/release.sh" (cat ${SCRIPT_DIR}/DEBIAN/control | envsubst) > "$deb_dir/DEBIAN/control" (cat ${SCRIPT_DIR}/DEBIAN/postinst | envsubst) > "$deb_dir/DEBIAN/postinst" diff --git a/packages/postgresml/release.sh b/packages/postgresml/release.sh index 7ce5eaada..2b0b2a31f 100644 --- a/packages/postgresml/release.sh +++ b/packages/postgresml/release.sh @@ -10,10 +10,10 @@ if [[ -z "$package_version" ]]; then exit 1 fi -if ! which dpkg-deb; then +if ! which deb-s3; then curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem sudo gem install deb-s3-0.11.4.gem - dpkg-deb --version + deb-s3 fi function package_name() { diff --git a/packages/postgresql-pgml/release.sh b/packages/postgresql-pgml/release.sh index e3ed42bf8..8e3118d24 100644 --- a/packages/postgresql-pgml/release.sh +++ b/packages/postgresql-pgml/release.sh @@ -15,10 +15,10 @@ else export ARCH=arm64 fi -if ! which dpkg-deb; then +if ! which deb-s3; then curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem sudo gem install deb-s3-0.11.4.gem - dpkg-deb --version + deb-s3 fi extension_dir="${SCRIPT_DIR}/../../pgml-extension" diff --git a/pgml-extension/docker/postgresml/Dockerfile b/pgml-extension/docker/postgresml/Dockerfile index c908bd150..4d17ca6b8 100644 --- a/pgml-extension/docker/postgresml/Dockerfile +++ b/pgml-extension/docker/postgresml/Dockerfile @@ -1,6 +1,5 @@ FROM nvidia/cuda:12.1.1-devel-ubuntu22.04 ENV PATH="/usr/local/cuda/bin:${PATH}" -ARG POSTGRESML_VERSION=2.7.4-1 RUN apt update && \ apt install -y \ lsb-release \ @@ -16,7 +15,7 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | te ENV TZ=UTC ENV DEBIAN_FRONTEND=noninteractive -RUN apt update -y && apt install git postgresml-15=${POSTGRESML_VERSION} postgresml-dashboard -y +RUN apt update -y && apt install git postgresml-15 postgresml-dashboard -y RUN git clone --branch v0.4.4 https://github.com/pgvector/pgvector && \ cd pgvector && \ echo "trusted = true" >> vector.control && \