Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Install ninja-build
run: sudo apt-get install ninja-build
- name: Install MATLAB
uses: matlab-actions/setup-matlab@a0180c939fb1a28de13f44f7b778b912384ced1f # v3.0.1
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
- name: Install ccache
Expand All @@ -74,7 +74,7 @@ jobs:
uses: actions/cache@v6
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-ubuntu-${{ hashFiles('cpp/**', 'matlab/**') }}
key: matlab-ccache-ubuntu-${{ hashFiles('cpp/**', 'matlab/**', '!matlab/build/**') }}
restore-keys: matlab-ccache-ubuntu-
- name: Build MATLAB Interface
run: ci/scripts/matlab_build.sh $(pwd)
Expand All @@ -83,7 +83,7 @@ jobs:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: matlab/install/arrow_matlab
uses: matlab-actions/run-tests@ae0e80cb44fdec28d35d0831d8acf38ee4fdf91a # v3.2.0
uses: matlab-actions/run-tests@214a16e600ef2c705a4b2dd6c0794dc6957682a9 # v3.3.0
with:
select-by-folder: matlab/test
strict: true
Expand All @@ -107,7 +107,7 @@ jobs:
- name: Install ninja-build
run: brew install ninja
- name: Install MATLAB
uses: matlab-actions/setup-matlab@a0180c939fb1a28de13f44f7b778b912384ced1f # v3.0.1
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
- name: Install ccache
Expand All @@ -123,7 +123,7 @@ jobs:
uses: actions/cache@v6
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-macos-${{ hashFiles('cpp/**', 'matlab/**') }}
key: matlab-ccache-macos-${{ hashFiles('cpp/**', 'matlab/**', '!matlab/build/**') }}
restore-keys: matlab-ccache-macos-
- name: Build MATLAB Interface
run: ci/scripts/matlab_build.sh $(pwd)
Expand All @@ -132,7 +132,7 @@ jobs:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: matlab/install/arrow_matlab
uses: matlab-actions/run-tests@ae0e80cb44fdec28d35d0831d8acf38ee4fdf91a # v3.2.0
uses: matlab-actions/run-tests@214a16e600ef2c705a4b2dd6c0794dc6957682a9 # v3.3.0
with:
select-by-folder: matlab/test
strict: true
Expand All @@ -147,7 +147,7 @@ jobs:
persist-credentials: false
fetch-depth: 0
- name: Install MATLAB
uses: matlab-actions/setup-matlab@a0180c939fb1a28de13f44f7b778b912384ced1f # v3.0.1
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
- name: Install ccache
Expand All @@ -165,7 +165,7 @@ jobs:
with:
path: |
${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-windows-${{ hashFiles('cpp/**', 'matlab/**') }}
key: matlab-ccache-windows-${{ hashFiles('cpp/**', 'matlab/**', '!matlab/build/**') }}
Comment thread
raulcd marked this conversation as resolved.
restore-keys: matlab-ccache-windows-

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ccache hashFiles seems to fails because it can't resolve a symbolic link on windows.
Given we switched away from hashFiles keys for other caching calls I'd propose we take the same approach here if possible (copying from cpp_windows.yml). It would likely also improve cache utilization. @pitrou ?
(I did not check if cache key is good enough)

Perhaps this is out of scope here and can be a separate PR, up to you @raulcd.

Suggested change
restore-keys: matlab-ccache-windows-
key: matlab-ccache-windows
restore-keys: matlab-ccache-windows
- name: Build MATLAB Interface

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like a different thing than what I was trying to do with this PR (just bump some actions and fix the Windows CI failures). I think we can do it but I just want to fix CI at this point.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opened the following issue to track it in case we want to do that:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let's merge this to fix the CI and change caching in another PR.

- name: Build MATLAB Interface
shell: cmd
Expand All @@ -177,7 +177,7 @@ jobs:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: matlab/install/arrow_matlab
uses: matlab-actions/run-tests@ae0e80cb44fdec28d35d0831d8acf38ee4fdf91a # v3.2.0
uses: matlab-actions/run-tests@214a16e600ef2c705a4b2dd6c0794dc6957682a9 # v3.3.0
with:
select-by-folder: matlab/test
strict: true
10 changes: 5 additions & 5 deletions dev/tasks/matlab/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install ninja-build
run: sudo apt-get update && sudo apt-get install ninja-build
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
Comment thread
raulcd marked this conversation as resolved.
with:
release: R2025b
{{ macros.github_configure_aws_credentials()|indent }}
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Install ninja-build
run: brew install ninja
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
{{ macros.github_configure_aws_credentials()|indent }}
Expand All @@ -104,7 +104,7 @@ jobs:
steps:
{{ macros.github_checkout_arrow()|indent }}
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
- name: Install sccache
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
cp arrow/LICENSE.txt arrow/matlab/install/arrow_matlab/LICENSE.txt
cp arrow/NOTICE.txt arrow/matlab/install/arrow_matlab/NOTICE.txt
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
uses: matlab-actions/setup-matlab@f9e43010f1ae678f7cfa0542fe2a4f60f7d1ad8d # v3.1.0
with:
release: R2025b
- name: Run commands
Expand All @@ -161,7 +161,7 @@ jobs:
ARROW_MATLAB_TOOLBOX_FOLDER: arrow/matlab/install/arrow_matlab
ARROW_MATLAB_TOOLBOX_OUTPUT_FOLDER: artifacts/matlab-dist
ARROW_MATLAB_TOOLBOX_VERSION: {{ arrow.no_rc_no_dev_version }}
uses: matlab-actions/run-command@v2
uses: matlab-actions/run-command@bfa857648f4895aa98a446fe41c85e0788421ed5 # v3.3.0
with:
command: packageMatlabInterface
{{ macros.github_upload_releases(["artifacts/matlab-dist/*.mltbx"])|indent }}
Loading