From 7d761314699c3b6668a407cb784dbc19f41ffc03 Mon Sep 17 00:00:00 2001 From: zyy17 Date: Tue, 1 Aug 2023 21:07:13 +0800 Subject: [PATCH] chore: modify the directory of release bucket and remove unused files (#2059) --- .github/actions/upload-artifacts/action.yml | 6 +- docker/aarch64/compile-python.sh | 87 --------------------- 2 files changed, 3 insertions(+), 90 deletions(-) delete mode 100755 docker/aarch64/compile-python.sh diff --git a/.github/actions/upload-artifacts/action.yml b/.github/actions/upload-artifacts/action.yml index 4ab1a0acd1..2a81a9e778 100644 --- a/.github/actions/upload-artifacts/action.yml +++ b/.github/actions/upload-artifacts/action.yml @@ -66,7 +66,7 @@ runs: - name: Upload artifacts to S3 shell: bash # The bucket layout will be: - # releases + # releases/greptimedb # ├── v0.1.0 # │ ├── greptime-darwin-amd64-pyo3-v0.1.0.sha256sum # │ └── greptime-darwin-amd64-pyo3-v0.1.0.tar.gz @@ -76,7 +76,7 @@ runs: run: | aws s3 cp \ ${{ inputs.artifacts-dir }}.tar.gz \ - s3://${{ inputs.release-to-s3-bucket }}/releases/${{ inputs.version }}/${{ inputs.artifacts-dir }}.tar.gz && \ + s3://${{ inputs.release-to-s3-bucket }}/releases/greptimedb/${{ inputs.version }}/${{ inputs.artifacts-dir }}.tar.gz && \ aws s3 cp \ ${{ inputs.artifacts-dir }}.sha256sum \ - s3://${{ inputs.release-to-s3-bucket }}/releases/${{ inputs.version }}/${{ inputs.artifacts-dir }}.sha256sum + s3://${{ inputs.release-to-s3-bucket }}/releases/greptimedb/${{ inputs.version }}/${{ inputs.artifacts-dir }}.sha256sum diff --git a/docker/aarch64/compile-python.sh b/docker/aarch64/compile-python.sh deleted file mode 100755 index ba0bef763d..0000000000 --- a/docker/aarch64/compile-python.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# this script will download Python source code, compile it, and install it to /usr/local/lib -# then use this python to compile cross-compiled python for aarch64 -ARCH=$1 -PYTHON_VERSION=3.10.10 -PYTHON_SOURCE_DIR=Python-${PYTHON_VERSION} -PYTHON_INSTALL_PATH_AMD64=${PWD}/python-${PYTHON_VERSION}/amd64 -PYTHON_INSTALL_PATH_AARCH64=${PWD}/python-${PYTHON_VERSION}/aarch64 - -function download_python_source_code() { - wget https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz - tar -xvf Python-$PYTHON_VERSION.tgz -} - -function compile_for_amd64_platform() { - mkdir -p "$PYTHON_INSTALL_PATH_AMD64" - - echo "Compiling for amd64 platform..." - - ./configure \ - --prefix="$PYTHON_INSTALL_PATH_AMD64" \ - --enable-shared \ - ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes \ - ac_cv_have_long_long_format=yes \ - --disable-ipv6 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no - - make - make install -} - -# explain Python compile options here a bit:s -# --enable-shared: enable building a shared Python library (default is no) but we do need it for calling from rust -# CC, CXX, AR, LD, RANLIB: set the compiler, archiver, linker, and ranlib programs to use -# build: the machine you are building on, host: the machine you will run the compiled program on -# --with-system-ffi: build _ctypes module using an installed ffi library, see Doc/library/ctypes.rst, not used in here TODO: could remove -# ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes: -# allow cross-compiled python to have -pthread set for CXX, see https://github.com/python/cpython/pull/22525 -# ac_cv_have_long_long_format=yes: target platform supports long long type -# disable-ipv6: disable ipv6 support, we don't need it in here -# ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no: disable pty support, we don't need it in here -function compile_for_aarch64_platform() { - export LD_LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LD_LIBRARY_PATH - export LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LIBRARY_PATH - export PATH=$PYTHON_INSTALL_PATH_AMD64/bin:$PATH - - mkdir -p "$PYTHON_INSTALL_PATH_AARCH64" - - echo "Compiling for aarch64 platform..." - echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH" - echo "LIBRARY_PATH: $LIBRARY_PATH" - echo "PATH: $PATH" - - ./configure --build=x86_64-linux-gnu --host=aarch64-linux-gnu \ - --prefix="$PYTHON_INSTALL_PATH_AARCH64" --enable-optimizations \ - CC=aarch64-linux-gnu-gcc \ - CXX=aarch64-linux-gnu-g++ \ - AR=aarch64-linux-gnu-ar \ - LD=aarch64-linux-gnu-ld \ - RANLIB=aarch64-linux-gnu-ranlib \ - --enable-shared \ - ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes \ - ac_cv_have_long_long_format=yes \ - --disable-ipv6 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no - - make - make altinstall -} - -# Main script starts here. -download_python_source_code - -# Enter the python source code directory. -cd $PYTHON_SOURCE_DIR || exit 1 - -# Build local python first, then build cross-compiled python. -compile_for_amd64_platform - -# Clean the build directory. -make clean && make distclean - -# Cross compile python for aarch64. -if [ "$ARCH" = "aarch64-unknown-linux-gnu" ]; then - compile_for_aarch64_platform -fi