From 3fe9c540345b199d9aaf205050edb137fcf915e0 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 14:27:23 -0500 Subject: [PATCH 01/11] force build --- .github/workflows/build_extension_deb.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index add78041..5f761e25 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,6 +6,9 @@ defaults: working-directory: ./ on: + push: + branches: + - fix-deb-build release: types: - created @@ -14,7 +17,7 @@ jobs: build-deb: # source: https://github.com/supabase/pg_jsonschema/blob/29fcd5b23abe3dd6a78a490082f34113de7813a1/.github/workflows/release.yml name: release .deb - if: github.event_name == 'release' + # if: github.event_name == 'release' strategy: matrix: extension_name: From 457c99e3b6046bc750fef44907cbb29a460a29cb Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 14:34:58 -0500 Subject: [PATCH 02/11] list files --- .github/workflows/build_extension_deb.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 5f761e25..d02b7343 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -28,11 +28,11 @@ jobs: - 0.11.3 postgres: - 14 - - 15 - - 16 + # - 15 + # - 16 box: - { runner: ubuntu-20.04, arch: amd64 } - - { runner: arm-runner, arch: arm64 } + # - { runner: arm-runner, arch: arm64 } runs-on: ${{ matrix.box.runner }} timeout-minutes: 90 steps: @@ -100,6 +100,7 @@ jobs: deb_version=$(grep '^version' Cargo.toml | head -1 | awk -F '"' '{print $2}') echo UPLOAD_URL=$(curl --silent https://api.github.com/repos/${{ github.repository }}/releases/tags/v${deb_version} | jq .upload_url --raw-output) >> $GITHUB_ENV echo ASSET_NAME=${{ matrix.extension_name }}-${deb_version}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu.deb >> $GITHUB_ENV + ls -alh - name: Upload deb to github release uses: actions/upload-release-asset@v1 From 39214ab51f9cfb4c68dc352fe73c6b61a902c6f2 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 14:41:32 -0500 Subject: [PATCH 03/11] fix path --- .github/workflows/build_extension_deb.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index d02b7343..9dffff22 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,9 +6,6 @@ defaults: working-directory: ./ on: - push: - branches: - - fix-deb-build release: types: - created @@ -28,11 +25,11 @@ jobs: - 0.11.3 postgres: - 14 - # - 15 - # - 16 + - 15 + - 16 box: - { runner: ubuntu-20.04, arch: amd64 } - # - { runner: arm-runner, arch: arm64 } + - { runner: arm-runner, arch: arm64 } runs-on: ${{ matrix.box.runner }} timeout-minutes: 90 steps: @@ -70,8 +67,10 @@ jobs: mkdir archive cp `find target/release -type f -name "${{ matrix.extension_name }}*"` archive + deb_version=$(grep '^version' Cargo.toml | head -1 | awk -F '"' '{print $2}') + # name of the package directory before packaging - package_dir=${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu + package_dir=${{ matrix.extension_name }}-${deb_version}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu # Copy files into directory structure mkdir -p ${package_dir}/usr/lib/postgresql/lib @@ -80,8 +79,6 @@ jobs: cp archive/*.control ${package_dir}/var/lib/postgresql/extension cp archive/*.sql ${package_dir}/var/lib/postgresql/extension - deb_version=$(grep '^version' Cargo.toml | head -1 | awk -F '"' '{print $2}') - mkdir -p ${package_dir}/DEBIAN touch ${package_dir}/DEBIAN/control echo 'Package: ${{ matrix.package_name }}' >> ${package_dir}/DEBIAN/control @@ -100,7 +97,6 @@ jobs: deb_version=$(grep '^version' Cargo.toml | head -1 | awk -F '"' '{print $2}') echo UPLOAD_URL=$(curl --silent https://api.github.com/repos/${{ github.repository }}/releases/tags/v${deb_version} | jq .upload_url --raw-output) >> $GITHUB_ENV echo ASSET_NAME=${{ matrix.extension_name }}-${deb_version}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu.deb >> $GITHUB_ENV - ls -alh - name: Upload deb to github release uses: actions/upload-release-asset@v1 From 8e9633d262060c6fb5e702cb570916bcb50e1738 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 16:59:30 -0500 Subject: [PATCH 04/11] for --- .github/workflows/build_extension_deb.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 9dffff22..81bad1f4 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,6 +6,9 @@ defaults: working-directory: ./ on: + push: + branches: + - fix-deb-build release: types: - created From f440cafa2a12739bc1e6be640253926865eb298b Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:06:02 -0500 Subject: [PATCH 05/11] rel --- .github/workflows/build_extension_deb.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 81bad1f4..ff0c9352 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,9 +6,6 @@ defaults: working-directory: ./ on: - push: - branches: - - fix-deb-build release: types: - created @@ -17,7 +14,7 @@ jobs: build-deb: # source: https://github.com/supabase/pg_jsonschema/blob/29fcd5b23abe3dd6a78a490082f34113de7813a1/.github/workflows/release.yml name: release .deb - # if: github.event_name == 'release' + if: github.event_name == 'release' strategy: matrix: extension_name: From 9696a27f5cd2fa5edfacb64f95ff6d537fa15123 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:18:00 -0500 Subject: [PATCH 06/11] change runner --- .github/workflows/build_extension_deb.yml | 28 ++++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index ff0c9352..46efce00 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,6 +6,9 @@ defaults: working-directory: ./ on: + push: + branches: + - fix-deb-build release: types: - created @@ -29,8 +32,11 @@ jobs: - 16 box: - { runner: ubuntu-20.04, arch: amd64 } - - { runner: arm-runner, arch: arm64 } - runs-on: ${{ matrix.box.runner }} + - { runner: arm64, arch: arm64 } + runs-on: + - "dind" + - "self-hosted" + - ${{ matrix.box.arch }} timeout-minutes: 90 steps: - uses: actions/checkout@v4 @@ -98,12 +104,12 @@ jobs: echo UPLOAD_URL=$(curl --silent https://api.github.com/repos/${{ github.repository }}/releases/tags/v${deb_version} | jq .upload_url --raw-output) >> $GITHUB_ENV echo ASSET_NAME=${{ matrix.extension_name }}-${deb_version}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu.deb >> $GITHUB_ENV - - name: Upload deb to github release - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ env.UPLOAD_URL }} - asset_path: ./${{ env.ASSET_NAME }} - asset_name: ${{ env.ASSET_NAME }} - asset_content_type: application/vnd.debian.binary-package + # - name: Upload deb to github release + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ env.UPLOAD_URL }} + # asset_path: ./${{ env.ASSET_NAME }} + # asset_name: ${{ env.ASSET_NAME }} + # asset_content_type: application/vnd.debian.binary-package From 327d090105185cabbd55fa390b140545243fe136 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:19:57 -0500 Subject: [PATCH 07/11] run on branch --- .github/workflows/build_extension_deb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 46efce00..6f10b15f 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -17,7 +17,7 @@ jobs: build-deb: # source: https://github.com/supabase/pg_jsonschema/blob/29fcd5b23abe3dd6a78a490082f34113de7813a1/.github/workflows/release.yml name: release .deb - if: github.event_name == 'release' + # if: github.event_name == 'release' strategy: matrix: extension_name: @@ -36,7 +36,7 @@ jobs: runs-on: - "dind" - "self-hosted" - - ${{ matrix.box.arch }} + - ${{ matrix.box.runner }} timeout-minutes: 90 steps: - uses: actions/checkout@v4 From c01362e88960282aead58fa25cd7e84211d16593 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:22:29 -0500 Subject: [PATCH 08/11] change runner --- .github/workflows/build_extension_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 6f10b15f..3e2bdf05 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -31,7 +31,7 @@ jobs: - 15 - 16 box: - - { runner: ubuntu-20.04, arch: amd64 } + - { runner: large-8x8, arch: amd64 } - { runner: arm64, arch: arm64 } runs-on: - "dind" From e3a110ecd43ad7bb3740fa016c43c7f80980dce0 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:50:32 -0500 Subject: [PATCH 09/11] run release --- .github/workflows/build_extension_deb.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index 3e2bdf05..a4db98a7 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -104,12 +104,12 @@ jobs: echo UPLOAD_URL=$(curl --silent https://api.github.com/repos/${{ github.repository }}/releases/tags/v${deb_version} | jq .upload_url --raw-output) >> $GITHUB_ENV echo ASSET_NAME=${{ matrix.extension_name }}-${deb_version}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu.deb >> $GITHUB_ENV - # - name: Upload deb to github release - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ env.UPLOAD_URL }} - # asset_path: ./${{ env.ASSET_NAME }} - # asset_name: ${{ env.ASSET_NAME }} - # asset_content_type: application/vnd.debian.binary-package + - name: Upload deb to github release + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ env.UPLOAD_URL }} + asset_path: ./${{ env.ASSET_NAME }} + asset_name: ${{ env.ASSET_NAME }} + asset_content_type: application/vnd.debian.binary-package From 5066b04d00f1c09bc936b0e4d0a581187f9f9f32 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 17:55:41 -0500 Subject: [PATCH 10/11] arm only --- .github/workflows/build_extension_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index a4db98a7..cee183e7 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -31,7 +31,7 @@ jobs: - 15 - 16 box: - - { runner: large-8x8, arch: amd64 } + # - { runner: large-8x8, arch: amd64 } - { runner: arm64, arch: arm64 } runs-on: - "dind" From b1da15ddc5632846f4ea9d00e7e299fb86c4112d Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 21 May 2024 18:00:09 -0500 Subject: [PATCH 11/11] only on release --- .github/workflows/build_extension_deb.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_extension_deb.yml b/.github/workflows/build_extension_deb.yml index cee183e7..175cd738 100644 --- a/.github/workflows/build_extension_deb.yml +++ b/.github/workflows/build_extension_deb.yml @@ -6,9 +6,6 @@ defaults: working-directory: ./ on: - push: - branches: - - fix-deb-build release: types: - created @@ -17,7 +14,7 @@ jobs: build-deb: # source: https://github.com/supabase/pg_jsonschema/blob/29fcd5b23abe3dd6a78a490082f34113de7813a1/.github/workflows/release.yml name: release .deb - # if: github.event_name == 'release' + if: github.event_name == 'release' strategy: matrix: extension_name: @@ -31,7 +28,7 @@ jobs: - 15 - 16 box: - # - { runner: large-8x8, arch: amd64 } + - { runner: large-8x8, arch: amd64 } - { runner: arm64, arch: arm64 } runs-on: - "dind"