diff --git a/.github/workflows/Rest.yml b/.github/workflows/Rest.yml index ad666e6..35d658e 100644 --- a/.github/workflows/Rest.yml +++ b/.github/workflows/Rest.yml @@ -16,18 +16,12 @@ jobs: matrix: # Add commits/tags to build against other DuckDB versions duckdb_version: [ '' ] - arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4'] + arch: ['linux_amd64'] vcpkg_version: [ '2023.04.15' ] include: - - arch: 'linux_amd64_gcc4' - container: 'quay.io/pypa/manylinux2014_x86_64' - vcpkg_triplet: 'x64-linux' - arch: 'linux_amd64' container: 'ubuntu:18.04' vcpkg_triplet: 'x64-linux' - - arch: 'linux_arm64' - container: 'ubuntu:18.04' - vcpkg_triplet: 'arm64-linux' env: VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }} GEN: Ninja @@ -35,7 +29,6 @@ jobs: steps: - name: Install required ubuntu packages - if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }} run: | apt-get update -y -qq apt-get install -y -qq software-properties-common @@ -45,7 +38,6 @@ jobs: apt-get install -y -qq tar pkg-config - name: Install Git 2.18.5 - if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }} run: | wget https://github.com/git/git/archive/refs/tags/v2.18.5.tar.gz tar xvf v2.18.5.tar.gz @@ -66,12 +58,10 @@ jobs: git checkout ${{ matrix.duckdb_version }} - name: Setup ManyLinux2014 - if: ${{ matrix.arch == 'linux_amd64_gcc4' }} run: | ./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh openssl python_alias - name: Setup Ubuntu - if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }} uses: ./duckdb/.github/actions/ubuntu_18_setup with: aarch64_cross_compile: 1 @@ -86,13 +76,10 @@ jobs: env: GEN: ninja STATIC_LIBCPP: 1 - CC: ${{ matrix.arch == 'linux_arm64' && 'aarch64-linux-gnu-gcc' || '' }} - CXX: ${{ matrix.arch == 'linux_arm64' && 'aarch64-linux-gnu-g++' || '' }} run: | make release - name: Start Rest Catalog - if: ${{ matrix.arch == 'linux_amd64_gcc4' || matrix.arch == 'linux_amd64' }} working-directory: scripts/ run: | ./start-rest-catalog.sh