diff --git a/.github/workflows/build-rtools40.yml b/.github/workflows/build-rtools40.yml index 36a2730835b..2403b76c49c 100644 --- a/.github/workflows/build-rtools40.yml +++ b/.github/workflows/build-rtools40.yml @@ -19,9 +19,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 1 - - name: Install rtools40 if needed - uses: r-windows/install-rtools@master - - name: Building TileDB with Rtools40 + - name: Building TileDB with Rtools43 run: | cd ${GITHUB_WORKSPACE}/.github/workflows/mingw-w64-tiledb pacman -Sy @@ -29,7 +27,7 @@ jobs: env: TILEDB_HOME: ${{ github.workspace }} MINGW_ARCH: ${{ matrix.msystem }} - shell: c:\rtools40\usr\bin\bash.exe --login {0} + shell: c:\rtools43\usr\bin\bash.exe --login {0} - name: "Upload binaries" uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml index d7de9f130c4..307aa48bd0f 100644 --- a/.github/workflows/full-ci.yml +++ b/.github/workflows/full-ci.yml @@ -29,123 +29,28 @@ concurrency: ## NOTE: the job ids below must be unique! jobs: - ci1: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: AZURE - matrix_image: ubuntu-22.04 - bootstrap_args: '--enable-azure --enable-release-symbols' - - ci2: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: GCS - matrix_image: ubuntu-20.04 - timeout: 120 - bootstrap_args: '--enable-gcs --enable-release-symbols' - - ci3: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_option: SERIALIZATION - matrix_image: ubuntu-22.04 - bootstrap_args: '--enable-serialization --enable-release-symbols' - - ci4: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: HDFS - matrix_image: ubuntu-22.04 - matrix_compiler_cc: 'gcc-13' - matrix_compiler_cxx: 'g++-13' - bootstrap_args: '--enable-hdfs --enable-static-tiledb --disable-werror' - - ci5: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: S3 - matrix_image: macos-11 - timeout: 120 - bootstrap_args: '--enable=s3,serialization,tools --enable-release-symbols' - - ci6: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: GCS - matrix_image: macos-11 - timeout: 120 - bootstrap_args: '--enable-gcs --enable-release-symbols' - - ci7: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_option: Experimental - matrix_image: ubuntu-22.04 - bootstrap_args: '--enable=experimental-features,serialization --enable-release-symbols' - - ci8: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: S3 - matrix_image: ubuntu-22.04 - timeout: 120 - bootstrap_args: '--enable-s3 --enable-release-symbols' - - ci9: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_option: ASAN - matrix_image: ubuntu-20.04 - timeout: 120 - bootstrap_args: '--enable-serialization' - asan: true - - ci10: - uses: ./.github/workflows/ci-linux_mac.yml - with: - ci_backend: AZURE - matrix_image: macos-11 - timeout: 120 - bootstrap_args: '--enable-azure' - - ci_msvc: - uses: ./.github/workflows/build-windows.yml - ci_mingw_r: uses: ./.github/workflows/build-rtools40.yml - backward_compatibility: - uses: ./.github/workflows/build-ubuntu20.04-backwards-compatibility.yml - - standalone: - uses: ./.github/workflows/unit-test-runs.yml - - ci_docker: - uses: ./.github/workflows/build-dockerfile.yml - - ci_rest: - uses: ./.github/workflows/ci-rest.yml - secrets: inherit - - # dummy job for branch protection check - full_ci_passed: - needs: [ - ci1, - ci2, - ci2, - ci3, - ci4, - ci5, - ci6, - ci7, - ci8, - ci9, - ci10, - ci_msvc, - backward_compatibility, - standalone - ] - runs-on: ubuntu-22.04 - steps: - - name: '' - run: echo "Complete" +# # dummy job for branch protection check +# full_ci_passed: +# needs: [ +# ci1, +# ci2, +# ci2, +# ci3, +# ci4, +# ci5, +# ci6, +# ci7, +# ci8, +# ci9, +# ci10, +# ci_msvc, +# backward_compatibility, +# standalone +# ] +# runs-on: ubuntu-22.04 +# steps: +# - name: '' +# run: echo "Complete" diff --git a/.github/workflows/mingw-w64-tiledb/PKGBUILD b/.github/workflows/mingw-w64-tiledb/PKGBUILD index bc594b1209e..036688d5300 100644 --- a/.github/workflows/mingw-w64-tiledb/PKGBUILD +++ b/.github/workflows/mingw-w64-tiledb/PKGBUILD @@ -1,19 +1,12 @@ _realname=tiledb pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.9000 +pkgver=2.1700 pkgrel=1 pkgdesc="Storage management library for sparse and dense array data (mingw-w64)" arch=("any") url="https://tiledb.com/" license=("MIT") -depends=("${MINGW_PACKAGE_PREFIX}-lz4" - "${MINGW_PACKAGE_PREFIX}-aws-sdk-cpp" - "${MINGW_PACKAGE_PREFIX}-bzip2" - "${MINGW_PACKAGE_PREFIX}-curl" - "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-zstd" - ) makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") options=("staticlibs" "strip") @@ -35,6 +28,7 @@ build() { export MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ + -DTILEDB_VCPKG=ON \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release \