Merge pull request #21 from supabase/or/v0.1.4

Bump for v0.1.4
supabase · Dec 12, 2022 · 9967e74 · 9967e74
2 parents c9acd4f + 63392d6
commit 9967e74
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,15 +59,15 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends git build-essential libpq-dev curl libreadline6-dev zlib1g-dev pkg-config cmake
           sudo apt-get install -y --no-install-recommends libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache
-          sudo apt-get install -y --no-install-recommends clang libclang-dev gcc
+          sudo apt-get install -y --no-install-recommends clang libclang-dev gcc tree
 
           # Install requested postgres version
           sudo apt install -y postgresql-${{ matrix.postgres }} postgresql-server-dev-${{ matrix.postgres }} -y
 
           # Ensure installed pg_config is first on path
           export PATH=$PATH:/usr/lib/postgresql/${{ matrix.postgres }}/bin
 
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain nightly && \
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable && \
             rustup --version && \
             rustc --version && \
             cargo --version
@@ -86,32 +86,46 @@ jobs:
           mkdir archive
           cp `find target/release -type f -name "${{ matrix.extension_name }}*"` archive
 
-          # Create directory structure
-          mkdir -p ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/usr/lib/postgresql/lib
-          mkdir -p ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/var/lib/postgresql/extension
+          # name of the package directory before packaging
+          package_dir=${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu
 
           # Copy files into directory structure
-          cp archive/*.so ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/usr/lib/postgresql/lib
-          cp archive/*.control ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/var/lib/postgresql/extension
-          cp archive/*.sql ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/var/lib/postgresql/extension
+          mkdir -p ${package_dir}/usr/lib/postgresql/lib
+          mkdir -p ${package_dir}/var/lib/postgresql/extension
+          cp archive/*.so ${package_dir}/usr/lib/postgresql/lib
+          cp archive/*.control ${package_dir}/var/lib/postgresql/extension
+          cp archive/*.sql ${package_dir}/var/lib/postgresql/extension
+
+          # symlinks to Copy files into directory structure
+          mkdir -p ${package_dir}/usr/lib/postgresql/${{ matrix.postgres }}/lib
+          cd ${package_dir}/usr/lib/postgresql/${{ matrix.postgres }}/lib
+          cp -s ../../lib/*.so .
+          cd ../../../../../..
+
+          mkdir -p ${package_dir}/usr/share/postgresql/${{ matrix.postgres }}/extension
+          cd ${package_dir}/usr/share/postgresql/${{ matrix.postgres }}/extension
+
+          cp -s ../../../../../var/lib/postgresql/extension/${{ matrix.extension_name }}.control .
+          cp -s ../../../../../var/lib/postgresql/extension/${{ matrix.extension_name }}*.sql .
+          cd ../../../../../..
 
           # Create install control file
           extension_version=${{ github.ref_name }}
           # strip the leading v
           deb_version=${extension_version:1}
 
-          mkdir -p ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN
-          touch ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
-          echo 'Package: ${{ matrix.package_name }}' >> ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
-          echo 'Version:' ${deb_version} >> ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
-          echo 'Architecture: ${{ matrix.box.arch }}' >> ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
-          echo 'Maintainer: supabase' >> ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
-          echo 'Description: A PostgreSQL extension' >> ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu/DEBIAN/control
+          mkdir -p ${package_dir}/DEBIAN
+          touch ${package_dir}/DEBIAN/control
+          echo 'Package: ${{ matrix.package_name }}' >> ${package_dir}/DEBIAN/control
+          echo 'Version:' ${deb_version} >> ${package_dir}/DEBIAN/control
+          echo 'Architecture: ${{ matrix.box.arch }}' >> ${package_dir}/DEBIAN/control
+          echo 'Maintainer: supabase' >> ${package_dir}/DEBIAN/control
+          echo 'Description: A PostgreSQL extension' >> ${package_dir}/DEBIAN/control
 
           # Create deb package
-          sudo chown -R root:root ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu
-          sudo chmod -R 00755 ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu
-          sudo dpkg-deb --build --root-owner-group ${{ matrix.extension_name }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu
+          sudo chown -R root:root ${package_dir}
+          sudo chmod -R 00755 ${package_dir}
+          sudo dpkg-deb --build --root-owner-group ${package_dir}
 
       - name: Get upload url
         run: echo UPLOAD_URL=$(curl --silent https://api.github.com/repos/${{ github.repository }}/releases/latest | jq .upload_url --raw-output) >> $GITHUB_ENV

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pg_jsonschema"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 
 [lib]