diff --git a/.github/workflows/build-rtools40.yml b/.github/workflows/build-rtools.yml similarity index 79% rename from .github/workflows/build-rtools40.yml rename to .github/workflows/build-rtools.yml index 704159c685c..a01703471b3 100644 --- a/.github/workflows/build-rtools40.yml +++ b/.github/workflows/build-rtools.yml @@ -1,4 +1,4 @@ -name: rtools40 +name: rtools on: workflow_call: @@ -32,21 +32,25 @@ jobs: ref: ${{ steps.vcpkg_commit.outputs.ref }} # Vcpkg requires fetching all commits. fetch-depth: 0 - - name: Install rtools40 if needed - uses: r-windows/install-rtools@master - - name: Building TileDB with Rtools40 + - uses: r-lib/actions/setup-r@v2 + with: + r-version: '4.3' + - name: Install RTools dependencies + run: | + pacman -Sy --noconfirm base-devel + shell: c:\rtools43\usr\bin\bash.exe --login {0} + - name: Build TileDB run: | export SystemDrive="$SYSTEMDRIVE" export SystemRoot="$SYSTEMROOT" export windir="$WINDIR" cd ${GITHUB_WORKSPACE}/.github/workflows/mingw-w64-tiledb - pacman -Sy makepkg-mingw --noconfirm --syncdeps env: TILEDB_HOME: ${{ github.workspace }} MINGW_ARCH: ${{ matrix.msystem }} VCPKG_ROOT: ${{ github.workspace }}/vcpkg - shell: c:\rtools40\usr\bin\bash.exe --login {0} + shell: c:\rtools43\usr\bin\bash.exe --login {0} - name: Set variables shell: bash id: get-values @@ -57,8 +61,8 @@ jobs: - name: "Rename release artifact and create sha256 hash" run: | mkdir release - mv .github/workflows/mingw-w64-tiledb/*.pkg.tar.xz release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.xz - 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 + mv .github/workflows/mingw-w64-tiledb/*.pkg.tar.zst release/tiledb-windows-x86_64-mingw64_ucrt64-${{ steps.get-values.outputs.release_version }}.tar.zst + 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 - name: "Upload binaries" uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml index 35b4be48be5..62b9f771a1e 100644 --- a/.github/workflows/full-ci.yml +++ b/.github/workflows/full-ci.yml @@ -122,7 +122,7 @@ jobs: uses: ./.github/workflows/build-windows.yml ci_mingw_r: - uses: ./.github/workflows/build-rtools40.yml + uses: ./.github/workflows/build-rtools.yml backward_compatibility: uses: ./.github/workflows/build-backwards-compatibility.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3561af20cd1..fec7b99045d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: version: '' Build-R-Binaries: - uses: ./.github/workflows/build-rtools40.yml + uses: ./.github/workflows/build-rtools.yml Test-Release-Artifacts: needs: