Skip to content

Add mac support to beta #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidbuzinski merged 9 commits into from
Apr 13, 2023
Merged

Add mac support to beta #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac72a5e
add mac support. Increase test timeout
davidbuzinski Apr 11, 2023
b68aa27
moved to posix compliant commands because mac
davidbuzinski Apr 11, 2023
5508948
test
davidbuzinski Apr 12, 2023
3408641
test
davidbuzinski Apr 12, 2023
b632bed
add unzip for mac mpm
davidbuzinski Apr 12, 2023
d8a5c62
fixin mac
davidbuzinski Apr 12, 2023
7923891
debugging
davidbuzinski Apr 12, 2023
77fb119
refixin mac
davidbuzinski Apr 12, 2023
435236f
fix no-output-timeout
davidbuzinski Apr 12, 2023
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
21 changes: 13 additions & 8 deletions .circleci/test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
executor: <<parameters.executor>>
steps:
- checkout
- matlab/install
- matlab/install:
no-output-timeout: 30m
- run:
name: Verify the matlab and mex scripts are available
command: |
Expand All @@ -63,6 +64,7 @@ jobs:
- checkout
- matlab/install:
release: "R2021bU2"
no-output-timeout: 30m
- run:
name: Verify the matlab and mex scripts are available
command: |
Expand All @@ -76,7 +78,8 @@ jobs:
type: executor
executor: <<parameters.executor>>
steps:
- matlab/install
- matlab/install:
no-output-timeout: 30m
- matlab/run-command:
command: f = fopen('myscript.m', 'w'); fwrite(f, 'assert(true)'); fclose(f);
- matlab/run-command:
Expand Down Expand Up @@ -117,6 +120,7 @@ jobs:
# Setup for Integ tests for matlab/run-tests
- matlab/install:
products: MATLAB Simulink Simulink_Test Simulink_Coverage
no-output-timeout: 30m
- run:
command: |
echo 'myvar = 123' > startup.m
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
executor: <<parameters.executor>>
steps:
# Setup for Integ tests for matlab/run-build
- matlab/install
- matlab/install:
no-output-timeout: 30m
- run:
command: |
cat \<<'_EOF' >> "buildfile.m"
Expand Down Expand Up @@ -385,29 +390,29 @@ workflows:
- batch-token
matrix:
parameters:
executor: [linux, windows]
executor: [linux, windows, macos]

- integration-test-install-release:
context:
- batch-token
matrix:
parameters:
executor: [linux, windows]
executor: [linux, windows, macos]

- integration-test-run-command:
matrix:
parameters:
executor: [linux, windows]
executor: [linux, windows, macos]

- integration-test-run-tests:
matrix:
parameters:
executor: [linux, windows]
executor: [linux, windows, macos]

- integration-test-run-build:
matrix:
parameters:
executor: [linux, windows]
executor: [linux, windows, macos]

- orb-tools/pack:
filters: *filters
Expand Down
2 changes: 1 addition & 1 deletion src/commands/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ steps:
PARAM_PRODUCTS: <<parameters.products>>
command: <<include(scripts/install.sh)>>
shell: bash
no-output-timeout: <<parameters.no-output-timeout>>
Copy link
Member

@sameagen-MW sameagen-MW Apr 13, 2023

Choose a reason for hiding this comment

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

What's the point of changing this name?

Copy link
Member Author

@davidbuzinski davidbuzinski Apr 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The no_output_timeout option is part of CircleCI's API that can go on the run step. We add a kebab-case version in some of the commands in our orb that gets passed through, but I noticed it was kebab-case on the run step here too so it wasn't actually doing anything when set.

no_output_timeout: <<parameters.no-output-timeout>>
9 changes: 8 additions & 1 deletion src/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ rootdir="$tmpdir/matlab_root"
mpmbaseurl="https://www.mathworks.com/mpm"

# resolve release
if [[ ${PARAM_RELEASE,,} = "latest" ]]; then
parsedrelease=$(echo "$PARAM_RELEASE" | tr '[:upper:]' '[:lower:]')
if [[ $parsedrelease = "latest" ]]; then
mpmrelease=$(curl https://ssd.mathworks.com/supportfiles/ci/matlab-release/v0/latest)
else
mpmrelease="${PARAM_RELEASE}"
Expand All @@ -56,6 +57,12 @@ if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then

rootdir=$(cygpath "$rootdir")
mpmpath=$(cygpath "$mpmpath")
elif [[ $os = Darwin ]]; then
rootdir="$rootdir/MATLAB.app"
batchinstalldir='/opt/matlab-batch'
mpmpath="$tmpdir/bin/maci64/mpm"
mpmsetup="unzip -q $tmpdir/mpm -d $tmpdir"
mwarch="maci64"
else
batchinstalldir='/opt/matlab-batch'
mpmpath="$tmpdir/mpm"
Expand Down