Adds rust support and 1.2.0 changes (#1040)

* Bump pg_azure_storage into 1.2.0 * Adds environment variables * Adds missing packages * Removes invalid parameter from citus_package * Removes mock azure cli * Adds unpacked files * Adds environment variables for pipelines * * Removes derived files from rpm spec * Changes nightlyref into main * * Adds all distros into nightly pipeline * Updates docker/login action in pipeline * Bump pg_azure_storage into 1.2.1 We could not release 1.2.0, since it has issues in Makefile. * Changes branch in main pipeline * Removes debian/stretch since EOL after 30.06.2022 * Updates tools version
citusdata · Apr 18, 2023 · 8dbf265 · 8dbf265
1 parent 5d638f9
commit 8dbf265
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 25 deletions.
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -8,6 +8,9 @@ env:
   GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
   PACKAGING_SECRET_KEY: ${{ secrets.PACKAGING_SECRET_KEY }}
   PACKAGING_PASSPHRASE: ${{ secrets.PACKAGING_PASSPHRASE }}
+  MSRUSTUP_PAT: ${{ secrets.MSRUSTUP_PAT }}
+  MSCODEHUB_USERNAME: ${{ secrets.MSCODEHUB_USERNAME }}
+  MSCODEHUB_PASSWORD: ${{ secrets.MSCODEHUB_PASSWORD }}
 on:
   push:
     branches:
@@ -23,8 +26,6 @@ jobs:
       matrix:
         platform:
           - el/7
-#          - el/8
-          - debian/stretch
           - debian/buster
           - debian/bullseye
           - ubuntu/bionic
@@ -35,11 +36,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      # This step is to fetch the images unanonymously to have higher bandwidth
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USER_NAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
       - name: Clone tools branch
-        run: git clone -b v0.8.24 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.25 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
-        run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources
+        run: sudo apt-get update -y && sudo apt-get install -y libcurl4-openssl-dev libssl-dev python3-testresources
 
       - name: Install python requirements
         run: python -m pip install -r tools/packaging_automation/requirements.txt

diff --git a/.github/workflows/build-pgazure-nightlies.yml b/.github/workflows/build-pgazure-nightlies.yml
@@ -9,6 +9,9 @@ env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
   DOCKERHUB_USER_NAME: ${{ secrets.DOCKERHUB_USER_NAME }}
   DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  MSRUSTUP_PAT: ${{ secrets.MSRUSTUP_PAT }}
+  MSCODEHUB_USERNAME: ${{ secrets.MSCODEHUB_USERNAME }}
+  MSCODEHUB_PASSWORD: ${{ secrets.MSCODEHUB_PASSWORD }}
 on:
   push:
     branches:
@@ -25,32 +28,29 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          # We will remove el/8 support for all apps in the future. For this project packaging image should be updated.But we
-          # don't want to invest.
-          # - el/8
-          # temporarily removed from nightlies since pg15 beta is not being downloaded for ol/7
-          # - ol/7
+          - el/7
+          - debian/buster
+          - debian/bullseye
+          - ubuntu/bionic
           - ubuntu/focal
+          - ubuntu/jammy
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
       # This step is to fetch the images unanonymously to have higher bandwidth
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USER_NAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Clone tools branch
-        run: git clone -b pgaz_test --depth=1  https://github.com/citusdata/tools.git tools
-
-      - name: Clone build branch
-        run: git clone -b "all-pg-azure-storage" --depth=1  https://github.com/citusdata/packaging.git packaging
+        run: git clone -b v0.8.25 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
-        run: sudo apt-get update && sudo apt-get install -y libcurl4
+        run: sudo apt-get update -y && sudo apt-get install -y libcurl4-openssl-dev libssl-dev python3-testresources
 
       - name: Install python requirements
         run: python -m pip install -r tools/packaging_automation/requirements.txt
@@ -64,8 +64,8 @@ jobs:
           --secret_key "${PACKAGING_SECRET_KEY}" \
           --passphrase "${PACKAGING_PASSPHRASE}" \
           --output_dir "$(pwd)/packages/" \
-          --input_files_dir "$(pwd)/packaging" \
-          --package_unsigned
+          --input_files_dir "$(pwd)"
+
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -81,4 +81,4 @@ jobs:
           --repository_name "${PACKAGE_CLOUD_REPO_NAME}" \
           --output_file_path "$(pwd)/packages" \
           --current_branch "${GITHUB_REF##*/}" \
-          --main_branch "${GITHUB_REF##*/}"
+          --main_branch "${MAIN_BRANCH}"
diff --git a/azure_storage.spec b/azure_storage.spec
@@ -1,17 +1,19 @@
-%global pgmajorversion 14
-%global pgpackageversion 14
+%global pgmajorversion 15
+%global pgpackageversion 15
 %global pginstdir /usr/pgsql-%{pgpackageversion}
 %global sname azure_storage
+%global INSTALL_RUST 1
+%global CI 1
 
 Summary:	Pg Azure storage
 Name:		%{sname}%{?pkginfix}_%{pgmajorversion}
 Provides:	%{sname}_%{pgmajorversion}
 Conflicts:	%{sname}_%{pgmajorversion}
-Version:	1.1.0.citus
+Version:	1.2.1.citus
 Release:	1%{dist}
 License:	AGPLv3
 Group:		Applications/Databases
-Source0:	https://github.com/citusdata/pgazure/archive/v1.1.0.tar.gz
+Source0:	https://github.com/citusdata/pgazure/archive/v1.2.1.tar.gz
 URL:		https://github.com/citusdata/pgazure
 BuildRequires:	postgresql%{pgmajorversion}-devel libcurl-devel libxml2-devel libxslt-devel openssl-devel
 Requires:	postgresql%{pgmajorversion}-server
@@ -32,6 +34,8 @@ make %{?_smp_mflags}
 # make %{?_smp_mflags}
 
 %install
+export INSTALL_RUST=1
+export CI=1
 %make_install PG_CONFIG=%{pginstdir}/bin/pg_config
 %clean
 %{__rm} -rf %{buildroot}
@@ -41,7 +45,6 @@ make %{?_smp_mflags}
 %{pginstdir}/lib/%{sname}.so
 %{pginstdir}/share/extension/%{sname}.control
 %{pginstdir}/bin/azure_storage_cli
-%{pginstdir}/bin/mock_azure_storage_cli
 %{pginstdir}/share/extension/azure_storage-*.sql
 %ifarch ppc64 ppc64le
   %else
@@ -53,6 +56,9 @@ make %{?_smp_mflags}
 %endif
 
 %changelog
+* Tue Apr 18 2023 - Gurkan Indibay <gindibay@microsoft> 1.2.1.citus-1
+- Official 1.2.1 release of Pg Azure Storage
+
 * Thu Dec 22 2022 - Gledis Zeneli <glediszeneli@microsoft> 1.1.0.citus-1
 - Official 1.1.0 release of Pg Azure Storage
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+azure-storage (1.2.1.citus-1) stable; urgency=low
+
+  * Official 1.2.1 release of azure-storage.
+
+ -- Gurkan Indibay <[email protected]>  Tue, 18 Apr 2023 10:45:00 +0300
+
 azure-storage (1.1.0.citus-1) stable; urgency=low
 
   * Official 1.1.0 release of azure-storage.

diff --git a/debian/rules b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+export INSTALL_RUST=1
+export CI=1
 
 include /usr/share/postgresql-common/pgxs_debian_control.mk
 

diff --git a/pkgvars b/pkgvars
@@ -2,7 +2,7 @@ pkgname=azure_storage
 hubproj=pgazure
 deb_pkgname=azure-storage
 pkgdesc='PG Azure Storage'
-pkglatest=1.1.0.citus-1
+pkglatest=1.2.1.citus-1
 versioning=fancy
-nightlyref=update-dependency-versions
+nightlyref=main