From a1d0e1a9d43c0f8ed9b6e5163a8a98edd3d4b27c Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:35:00 -0600 Subject: [PATCH 1/7] Update ubuntu-packages-and-docker-image.yml --- .github/workflows/ubuntu-packages-and-docker-image.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index c77ba497d..6d67c226c 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -112,6 +112,14 @@ jobs: sudo gem install deb-s3-0.11.4.gem sudo dpkg --configure -a dpkg-deb --version + + - name: Remove dpkg locks + run: | + sudo rm -f /var/lib/dpkg/lock + sudo rm -f /var/lib/dpkg/lock-frontend + sudo rm -f /var/lib/apt/lists/lock + sudo rm -f /var/cache/apt/archives/lock + - name: Install pgrx uses: postgresml/gh-actions-cargo@master with: From 5029aed1da3f12aad9ca7d1b421a98c24509d104 Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 12:42:05 -0600 Subject: [PATCH 2/7] keeps locks; restrict concurrency --- .github/workflows/ubuntu-packages-and-docker-image.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 6d67c226c..a7ad452df 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -12,6 +12,7 @@ jobs: postgresml-pgml: strategy: fail-fast: false # Let the other job finish + max-parallel: 1 # Only one job at a time from this matrix matrix: include: # Ubuntu 24.04 LTS (Noble) @@ -112,13 +113,6 @@ jobs: sudo gem install deb-s3-0.11.4.gem sudo dpkg --configure -a dpkg-deb --version - - - name: Remove dpkg locks - run: | - sudo rm -f /var/lib/dpkg/lock - sudo rm -f /var/lib/dpkg/lock-frontend - sudo rm -f /var/lib/apt/lists/lock - sudo rm -f /var/cache/apt/archives/lock - name: Install pgrx uses: postgresml/gh-actions-cargo@master From afa2fb74d3d706b8c3f6f13585b721631435e9b9 Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 14:25:08 -0600 Subject: [PATCH 3/7] max-parallel for postgresml-dashboard --- .github/workflows/ubuntu-packages-and-docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index a7ad452df..ccecf447c 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -214,6 +214,7 @@ jobs: postgresml-dashboard: strategy: fail-fast: false + max-parallel: 1 # Only one job at a time from this matrix matrix: include: # Ubuntu 24.04 LTS (Noble) From d3cc17fdd3dff4a1291b1bff5b7383a0fb1e552c Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:19:46 -0600 Subject: [PATCH 4/7] try some concurrency management --- .github/workflows/ubuntu-packages-and-docker-image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index ccecf447c..13268c880 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -5,6 +5,11 @@ on: inputs: packageVersion: default: "2.10.0" + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: # # PostgresML extension. From 7c6bd26be300133688eca08d2d723389bb17ccab Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:50:36 -0600 Subject: [PATCH 5/7] see if Jammy is the problem --- .../workflows/ubuntu-packages-and-docker-image.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 13268c880..716375e7b 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -223,12 +223,12 @@ jobs: matrix: include: # Ubuntu 24.04 LTS (Noble) - - os: "ubuntu-24.04" - ubuntu_version: "noble" - arch: "amd64" - - os: "ubuntu-24.04-arm" - ubuntu_version: "noble" - arch: "arm64" + # - os: "ubuntu-24.04" + # ubuntu_version: "noble" + # arch: "amd64" + # - os: "ubuntu-24.04-arm" + # ubuntu_version: "noble" + # arch: "arm64" # Ubuntu 22.04 LTS (Jammy) - os: "ubuntu-22.04" ubuntu_version: "jammy" From 4978d9eee65d6b1837fcc1c8a2e70b350d92f588 Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:16:53 -0600 Subject: [PATCH 6/7] update deb-s3 --- .github/workflows/ubuntu-packages-and-docker-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 716375e7b..9e794f676 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -114,8 +114,8 @@ jobs: ruby \ lld - 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 + curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.8/deb-s3-0.11.8.gem + sudo gem install deb-s3-0.11.8.gem sudo dpkg --configure -a dpkg-deb --version @@ -244,8 +244,8 @@ jobs: toolchain: stable - name: Update dependencies run: | - 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 + curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.8/deb-s3-0.11.8.gem + sudo gem install deb-s3-0.11.8.gem sudo dpkg --configure -a dpkg-deb --version - name: Build and release package From 67ab9c6c72b03a6caf2a48f04407da1002dd274d Mon Sep 17 00:00:00 2001 From: kczimm <4733573+kczimm@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:29:59 -0600 Subject: [PATCH 7/7] test serialization --- .github/workflows/ubuntu-packages-and-docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 9e794f676..8a78bd7ce 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -15,6 +15,7 @@ jobs: # PostgresML extension. # postgresml-pgml: + needs: postgresml-dashboard # REMOVE: testing serialization strategy: fail-fast: false # Let the other job finish max-parallel: 1 # Only one job at a time from this matrix