From ce54c425dc224fbfef51c204b08440d35fb3f8b4 Mon Sep 17 00:00:00 2001 From: gindibay Date: Wed, 4 Jan 2023 20:21:50 +0300 Subject: [PATCH 1/4] Adds ubuntu jammy support for 8.3.4 Additionally updates tools versions to get successful build and adds ignores for OpenSSl warnings --- .../build-citus-enterprise-nightlies.yml | 64 ------------------- .github/workflows/build-package.yml | 11 +--- .../workflows/update_package_properties.yml | 2 +- packaging_ignore.yml | 9 ++- 4 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/build-citus-enterprise-nightlies.yml diff --git a/.github/workflows/build-citus-enterprise-nightlies.yml b/.github/workflows/build-citus-enterprise-nightlies.yml deleted file mode 100644 index 4b1678508..000000000 --- a/.github/workflows/build-citus-enterprise-nightlies.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Build and publish citus entertprise nightly packages - -env: - GH_TOKEN: ${{ secrets.GH_TOKEN }} - PACKAGING_PASSPHRASE: ${{ secrets.PACKAGING_PASSPHRASE }} - PACKAGING_SECRET_KEY: ${{ secrets.PACKAGING_SECRET_KEY }} - UNENCRYPTED_PACKAGE: true - DOCKERHUB_USER_NAME: ${{ secrets.DOCKERHUB_USER_NAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} -on: - # TODO: revert this once we finish backports of security patches - # push: - # branches: - # - "**" - workflow_dispatch: - -jobs: - build_package: - name: Build package - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - platform: - - el/7 - - el/8 - - ol/7 - - debian/stretch - - debian/buster - - debian/bullseye - - ubuntu/bionic - - ubuntu/focal - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # This step is to fetch the images unanonymously to have higher bandwidth - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USER_NAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Clone tools branch - run: git clone -b v0.8.12 --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 - - - name: Install python requirements - run: python -m pip install -r tools/packaging_automation/requirements.txt - - - name: Build packages - run: | - python -m tools.packaging_automation.citus_package \ - --gh_token "${GH_TOKEN}" \ - --platform "${{ matrix.platform }}" \ - --build_type "nightly" \ - --secret_key "${PACKAGING_SECRET_KEY}" \ - --passphrase "${PACKAGING_PASSPHRASE}" \ - --output_dir "$(pwd)/packages/" \ - --input_files_dir "$(pwd)" - diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 5c0e6b8ea..d53dc4595 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -23,21 +23,14 @@ jobs: fail-fast: false matrix: platform: - - el/7 - - el/8 - - ol/7 - - ol/8 - - debian/stretch - - debian/buster - - ubuntu/bionic - - ubuntu/focal + - ubuntu/jammy steps: - name: Checkout repository uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.12 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.24 --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 diff --git a/.github/workflows/update_package_properties.yml b/.github/workflows/update_package_properties.yml index 9bc76b689..78c8f2806 100644 --- a/.github/workflows/update_package_properties.yml +++ b/.github/workflows/update_package_properties.yml @@ -39,7 +39,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Clone tools branch - run: git clone -b v0.8.14 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/packaging_ignore.yml b/packaging_ignore.yml index 255febf68..5a7d827d8 100644 --- a/packaging_ignore.yml +++ b/packaging_ignore.yml @@ -16,7 +16,14 @@ base: - ".*: substitution variable \\$\\{postgresql:Depends\\} unused, but is defined.*" - ".* unused substitution variable \\$\\{postgresql:Depends\\}.*" - ".* warning: field 'compareValueFunctionCall' with variable sized type 'FunctionCall2InfoData'.*" - - "1 warning generated" + - ".*: warning: 'RSA_new' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]" + - ".*: warning: 'RSA_generate_key_ex' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]" + - ".*: warning: 'RSA_new' is deprecated \\[-Wdeprecated-declarations\\]" + - ".*: warning: 'RSA_generate_key_ex' is deprecated \\[-Wdeprecated-declarations\\]" + - ".*: warning: 'EVP_PKEY_assign' is deprecated.*" + - "autoreconf: warning: autoconf input should be named 'configure.ac', not 'configure.in'" + - "autoheader: warning: autoconf input should be named 'configure.ac', not 'configure.in'" + - "\\d+ warnings generated." debian: - ".*: W: invalid-license Commercial" From 66f6246cc2ab48e92f51d96c47ea3ecdb3d8dd40 Mon Sep 17 00:00:00 2001 From: gindibay Date: Thu, 5 Jan 2023 08:37:45 +0300 Subject: [PATCH 2/4] Removes duplicate ignore lists --- packaging_ignore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging_ignore.yml b/packaging_ignore.yml index 5a7d827d8..0a45dfea3 100644 --- a/packaging_ignore.yml +++ b/packaging_ignore.yml @@ -16,6 +16,7 @@ base: - ".*: substitution variable \\$\\{postgresql:Depends\\} unused, but is defined.*" - ".* unused substitution variable \\$\\{postgresql:Depends\\}.*" - ".* warning: field 'compareValueFunctionCall' with variable sized type 'FunctionCall2InfoData'.*" + - "1 warning generated" - ".*: warning: 'RSA_new' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]" - ".*: warning: 'RSA_generate_key_ex' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]" - ".*: warning: 'RSA_new' is deprecated \\[-Wdeprecated-declarations\\]" From 8a3dd7fb74d2eb5621968eb6fef80abed4f4bd91 Mon Sep 17 00:00:00 2001 From: gindibay Date: Thu, 5 Jan 2023 08:38:18 +0300 Subject: [PATCH 3/4] Removes duplicate ignore lists --- .github/workflows/update_package_properties.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_package_properties.yml b/.github/workflows/update_package_properties.yml index 78c8f2806..9bc76b689 100644 --- a/.github/workflows/update_package_properties.yml +++ b/.github/workflows/update_package_properties.yml @@ -39,7 +39,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - 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.14 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | From 8b8ad5bbb255e584b491563aaa1c8ad96fbade7f Mon Sep 17 00:00:00 2001 From: gindibay Date: Thu, 5 Jan 2023 08:51:29 +0300 Subject: [PATCH 4/4] Changes base branch name --- .github/workflows/build-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index d53dc4595..4c5d3dd44 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -1,7 +1,7 @@ name: Build Package env: - MAIN_BRANCH: "all-enterprise" + MAIN_BRANCH: "8.3.4-ent-base" PACKAGE_CLOUD_REPO_NAME: "citusdata/enterprise" PACKAGE_CLOUD_API_TOKEN: ${{ secrets.PACKAGE_CLOUD_API_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}