Skip to content

Commit a21dc5b

Browse files
Update RTools version to 4.3. (#5753)
This PR updates the version of the RTools toolchain to 4.3, the earliest version we support for R. --- TYPE: NO_HISTORY
1 parent c0c802f commit a21dc5b

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: rtools40
1+
name: rtools
22
on:
33
workflow_call:
44

@@ -32,21 +32,25 @@ jobs:
3232
ref: ${{ steps.vcpkg_commit.outputs.ref }}
3333
# Vcpkg requires fetching all commits.
3434
fetch-depth: 0
35-
- name: Install rtools40 if needed
36-
uses: r-windows/install-rtools@master
37-
- name: Building TileDB with Rtools40
35+
- uses: r-lib/actions/setup-r@v2
36+
with:
37+
r-version: '4.3'
38+
- name: Install RTools dependencies
39+
run: |
40+
pacman -Sy --noconfirm base-devel
41+
shell: c:\rtools43\usr\bin\bash.exe --login {0}
42+
- name: Build TileDB
3843
run: |
3944
export SystemDrive="$SYSTEMDRIVE"
4045
export SystemRoot="$SYSTEMROOT"
4146
export windir="$WINDIR"
4247
cd ${GITHUB_WORKSPACE}/.github/workflows/mingw-w64-tiledb
43-
pacman -Sy
4448
makepkg-mingw --noconfirm --syncdeps
4549
env:
4650
TILEDB_HOME: ${{ github.workspace }}
4751
MINGW_ARCH: ${{ matrix.msystem }}
4852
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
49-
shell: c:\rtools40\usr\bin\bash.exe --login {0}
53+
shell: c:\rtools43\usr\bin\bash.exe --login {0}
5054
- name: Set variables
5155
shell: bash
5256
id: get-values
@@ -57,8 +61,8 @@ jobs:
5761
- name: "Rename release artifact and create sha256 hash"
5862
run: |
5963
mkdir release
60-
mv .github/workflows/mingw-w64-tiledb/*.pkg.tar.xz release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.xz
61-
sha256sum release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.xz > release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.xz.sha256
64+
mv .github/workflows/mingw-w64-tiledb/*.pkg.tar.zst release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.zst
65+
sha256sum release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.zst > release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.zst.sha256
6266
- name: "Upload binaries"
6367
uses: actions/upload-artifact@v4
6468
with:

.github/workflows/full-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
uses: ./.github/workflows/build-windows.yml
123123

124124
ci_mingw_r:
125-
uses: ./.github/workflows/build-rtools40.yml
125+
uses: ./.github/workflows/build-rtools.yml
126126

127127
backward_compatibility:
128128
uses: ./.github/workflows/build-backwards-compatibility.yml

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
version: ''
4747

4848
Build-R-Binaries:
49-
uses: ./.github/workflows/build-rtools40.yml
49+
uses: ./.github/workflows/build-rtools.yml
5050

5151
Test-Release-Artifacts:
5252
needs:

0 commit comments

Comments
 (0)