From ac72a5eafacc7d517441878003616f377008ea6b Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Tue, 11 Apr 2023 09:58:30 -0400 Subject: [PATCH 1/9] add mac support. Increase test timeout --- .circleci/test-deploy.yml | 21 +++++++++++++-------- src/scripts/install.sh | 6 ++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index 672afc5..de6423a 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -40,7 +40,8 @@ jobs: executor: <> steps: - checkout - - matlab/install + - matlab/install: + no-output-timeout: 30m - run: name: Verify the matlab and mex scripts are available command: | @@ -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: | @@ -76,7 +78,8 @@ jobs: type: executor 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: @@ -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 @@ -313,7 +317,8 @@ jobs: executor: <> steps: # Setup for Integ tests for matlab/run-build - - matlab/install + - matlab/install: + no-output-timeout: 30m - run: command: | cat \<<'_EOF' >> "buildfile.m" @@ -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 diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 8a4851a..3855d88 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -56,6 +56,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/mpm" + mpmsetup="" + mwarch="maci64" else batchinstalldir='/opt/matlab-batch' mpmpath="$tmpdir/mpm" From b68aa27541bcd87c77f397ec4a1ab3ccd9c0cfd8 Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Tue, 11 Apr 2023 11:07:32 -0400 Subject: [PATCH 2/9] moved to posix compliant commands because mac --- src/scripts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 3855d88..3345619 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -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}" From 550894806f08766dd11452c7b6165346c93c7ebd Mon Sep 17 00:00:00 2001 From: David Buzinski <103441853+davidbuzinski@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:15:41 -0400 Subject: [PATCH 3/9] test --- .circleci/test-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index de6423a..fa8a220 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -62,6 +62,9 @@ jobs: executor: <> steps: - checkout + - run: + name: test + command: uname - matlab/install: release: "R2021bU2" no-output-timeout: 30m From 34086413fe80af87f828cb8bba32883e89a864cf Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 13:32:11 -0400 Subject: [PATCH 4/9] test --- .circleci/test-deploy.yml | 3 --- src/scripts/install.sh | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index fa8a220..de6423a 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -62,9 +62,6 @@ jobs: executor: <> steps: - checkout - - run: - name: test - command: uname - matlab/install: release: "R2021bU2" no-output-timeout: 30m diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 3345619..36c797a 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -24,6 +24,7 @@ downloadAndRun() { } os=$(uname) +echo $os tmpdir=$(dirname "$(mktemp -u)") rootdir="$tmpdir/matlab_root" mpmbaseurl="https://www.mathworks.com/mpm" From b632bed2bb9e291fcd2d708442d03a9b9277450d Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 13:42:00 -0400 Subject: [PATCH 5/9] add unzip for mac mpm --- src/scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 36c797a..04568a1 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -24,7 +24,6 @@ downloadAndRun() { } os=$(uname) -echo $os tmpdir=$(dirname "$(mktemp -u)") rootdir="$tmpdir/matlab_root" mpmbaseurl="https://www.mathworks.com/mpm" @@ -62,8 +61,9 @@ elif [[ $os = Darwin ]]; then rootdir="$rootdir/MATLAB.app" batchinstalldir='/opt/matlab-batch' mpmpath="$tmpdir/mpm" - mpmsetup="" + mpmsetup="unzip -q $tmpdir/mpm -d $tmpdir" mwarch="maci64" + echo $os else batchinstalldir='/opt/matlab-batch' mpmpath="$tmpdir/mpm" From d8a5c6207bf011d4e9d10e8edc57476b97dfbcd6 Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 15:50:11 -0400 Subject: [PATCH 6/9] fixin mac --- src/scripts/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 04568a1..428428e 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -60,10 +60,9 @@ if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then elif [[ $os = Darwin ]]; then rootdir="$rootdir/MATLAB.app" batchinstalldir='/opt/matlab-batch' - mpmpath="$tmpdir/mpm" + mpmpath="$tmpdir/mpm/bin/maci64/mpm" mpmsetup="unzip -q $tmpdir/mpm -d $tmpdir" mwarch="maci64" - echo $os else batchinstalldir='/opt/matlab-batch' mpmpath="$tmpdir/mpm" From 79238913a57ccfa2e00112743bb3d883168bc484 Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 15:52:19 -0400 Subject: [PATCH 7/9] debugging --- src/scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 428428e..15f6b8f 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -73,6 +73,7 @@ fi # install mpm curl -o "$tmpdir/mpm" -sfL "$mpmbaseurl/$mwarch/mpm" eval $mpmsetup +ls $mpmpath chmod +x "$mpmpath" mkdir -p "$rootdir" From 77fb119af3f2d13274ac85c4f722ba8278cd5563 Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 15:53:27 -0400 Subject: [PATCH 8/9] refixin mac --- src/scripts/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 15f6b8f..8b71438 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -60,7 +60,7 @@ if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then elif [[ $os = Darwin ]]; then rootdir="$rootdir/MATLAB.app" batchinstalldir='/opt/matlab-batch' - mpmpath="$tmpdir/mpm/bin/maci64/mpm" + mpmpath="$tmpdir/bin/maci64/mpm" mpmsetup="unzip -q $tmpdir/mpm -d $tmpdir" mwarch="maci64" else @@ -73,7 +73,6 @@ fi # install mpm curl -o "$tmpdir/mpm" -sfL "$mpmbaseurl/$mwarch/mpm" eval $mpmsetup -ls $mpmpath chmod +x "$mpmpath" mkdir -p "$rootdir" From 435236fc16df3116864a5d76140e837ef5e05d57 Mon Sep 17 00:00:00 2001 From: David Buzinski Date: Wed, 12 Apr 2023 16:05:05 -0400 Subject: [PATCH 9/9] fix no-output-timeout --- src/commands/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/install.yml b/src/commands/install.yml index c241156..3d5946b 100644 --- a/src/commands/install.yml +++ b/src/commands/install.yml @@ -30,4 +30,4 @@ steps: PARAM_PRODUCTS: <> command: <> shell: bash - no-output-timeout: <> + no_output_timeout: <>