Skip to content

Commit 9a4fbc1

Browse files
levkklevkk
authored
Pretty close! (#924)
1 parent 88ca844 commit 9a4fbc1

File tree

11 files changed

+28
-15
lines changed

11 files changed

+28
-15
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
jobs:
66
tests:
7-
runs-on: buildjet-16vcpu-ubuntu-2204
7+
runs-on: buildjet-4vcpu-ubuntu-2204
88
defaults:
99
run:
1010
working-directory: pgml-extension

‎.github/workflows/ubuntu-packages-and-docker-image.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false # Let the other job finish
1515
matrix:
16-
os: ["buildjet-16vcpu-ubuntu-2204", "buildjet-16vcpu-ubuntu-2204-arm"]
16+
os: ["buildjet-4vcpu-ubuntu-2204", "buildjet-8vcpu-ubuntu-2204-arm"]
1717
runs-on: ${{ matrix.os }}
18-
defaults:
19-
run:
20-
working-directory: pgml-extension
2118
steps:
2219
- uses: actions/checkout@v3
2320
- uses: actions-rs/toolchain@v1
@@ -28,6 +25,16 @@ jobs:
2825
with:
2926
working-directory: pgml-extension
3027
command: version
28+
- name: Cache artifacts
29+
uses: buildjet/cache@v3
30+
with:
31+
path: pgml-extension/target
32+
key: buildjet-pgml-extension-artifacts-1 # Change this when dependencies change
33+
- name: Cache pgrx
34+
uses: buildjet/cache@v3
35+
with:
36+
path: ~/.cargo
37+
key: buildjet-pgml-extension-pgrx-2 # Change this when dependencies change
3138
- name: Install dependencies
3239
env:
3340
DEBIAN_FRONTEND: noninteractive
@@ -140,6 +147,7 @@ jobs:
140147
postgresml:
141148
needs: postgresml-pgml
142149
strategy:
150+
fail-fast: false # Let the other job finish
143151
matrix:
144152
os: ["ubuntu-22.04"]
145153
runs-on: ${{ matrix.os }}
@@ -183,6 +191,7 @@ jobs:
183191
- postgresml
184192
- postgresml-dashboard
185193
strategy:
194+
fail-fast: false # Let the other job finish
186195
matrix:
187196
os: ["buildjet-4vcpu-ubuntu-2204"]
188197
runs-on: ${{ matrix.os }}

‎.github/workflows/ubuntu-postgresml-python-package.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
jobs:
1010
postgresml-python:
1111
strategy:
12+
fail-fast: false # Let the other job finish
1213
matrix:
1314
os: ["buildjet-4vcpu-ubuntu-2204", "buildjet-4vcpu-ubuntu-2204-arm"]
1415
runs-on: ${{ matrix.os }}

‎packages/postgresml-dashboard/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ mkdir -p "$deb_dir"
1818

1919
cp -R ${SCRIPT_DIR}/* "$deb_dir"
2020
rm "$deb_dir/build.sh"
21+
rm "$deb_dir/release.sh"
22+
2123

2224
( cd ${SCRIPT_DIR}/../../pgml-dashboard && \
2325
cargo build --release && \

‎packages/postgresml-dashboard/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ else
1515
export ARCH=arm64
1616
fi
1717

18-
if ! which dpkg-deb; then
18+
if ! which deb-s3; then
1919
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
2020
sudo gem install deb-s3-0.11.4.gem
21-
dpkg-deb --version
21+
deb-s3
2222
fi
2323

2424
function package_name() {

‎packages/postgresml-python/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ mkdir -p "$deb_dir"
2121

2222
cp -R ${SCRIPT_DIR}/* "$deb_dir"
2323
rm "$deb_dir/build.sh"
24+
rm "$deb_dir/release.sh"
2425

2526
(cat ${SCRIPT_DIR}/DEBIAN/control | envsubst) > "$deb_dir/DEBIAN/control"
2627
(cat ${SCRIPT_DIR}/DEBIAN/postinst | envsubst '${PGVERSION}') > "$deb_dir/DEBIAN/postinst"

‎packages/postgresml-python/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ if [[ -z "$package_version" ]]; then
1616
exit 1
1717
fi
1818

19-
if ! which dpkg-deb; then
19+
if ! which deb-s3; then
2020
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
2121
sudo gem install deb-s3-0.11.4.gem
22-
dpkg-deb --version
22+
deb-s3
2323
fi
2424

2525
sudo apt install python3-pip python3 python3-virtualenv -y

‎packages/postgresml/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ mkdir -p "$deb_dir"
1313

1414
cp -R ${SCRIPT_DIR}/* "$deb_dir"
1515
rm "$deb_dir/build.sh"
16+
rm "$deb_dir/release.sh"
1617

1718
(cat ${SCRIPT_DIR}/DEBIAN/control | envsubst) > "$deb_dir/DEBIAN/control"
1819
(cat ${SCRIPT_DIR}/DEBIAN/postinst | envsubst) > "$deb_dir/DEBIAN/postinst"

‎packages/postgresml/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ if [[ -z "$package_version" ]]; then
1010
exit 1
1111
fi
1212

13-
if ! which dpkg-deb; then
13+
if ! which deb-s3; then
1414
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
1515
sudo gem install deb-s3-0.11.4.gem
16-
dpkg-deb --version
16+
deb-s3
1717
fi
1818

1919
function package_name() {

‎packages/postgresql-pgml/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ else
1515
export ARCH=arm64
1616
fi
1717

18-
if ! which dpkg-deb; then
18+
if ! which deb-s3; then
1919
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
2020
sudo gem install deb-s3-0.11.4.gem
21-
dpkg-deb --version
21+
deb-s3
2222
fi
2323

2424
extension_dir="${SCRIPT_DIR}/../../pgml-extension"

0 commit comments

Comments
 (0)