Skip to content

Commit

Permalink
Update mingw-w64 R build check to rtools43
Browse files Browse the repository at this point in the history
  • Loading branch information
ihnorton committed Sep 15, 2023
1 parent 1dd7675 commit 266a2ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build-rtools40.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@ 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
makepkg-mingw --noconfirm --syncdeps
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:
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/mingw-w64-tiledb/PKGBUILD
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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 \
Expand Down

0 comments on commit 266a2ac

Please sign in to comment.