From 6f6e25c4af75f659d210e2861b9210450be9f655 Mon Sep 17 00:00:00 2001 From: tsharmaMW Date: Fri, 16 May 2025 13:56:28 +0530 Subject: [PATCH] fix typo and update MATLAB releases --- .circleci/CrossPlatformBuilder.yml | 2 +- .github/workflows/CrossPlatformBuilder.yml | 6 +++++- .github/workflows/ToolboxDistribution.yml | 6 +++++- AzureDevOps/CrossPlatformBuilder.yml | 20 ++++++++++---------- AzureDevOps/ToolboxDistribution.yml | 2 +- Jenkins/CrossPlatformBuilder.yml | 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.circleci/CrossPlatformBuilder.yml b/.circleci/CrossPlatformBuilder.yml index eb85751..acf5e86 100644 --- a/.circleci/CrossPlatformBuilder.yml +++ b/.circleci/CrossPlatformBuilder.yml @@ -48,4 +48,4 @@ workflows: matrix: parameters: os: [linux, macos, windows] - release: ["R2024a", "R2024b"] \ No newline at end of file + release: ["R2024b", "R2025a"] \ No newline at end of file diff --git a/.github/workflows/CrossPlatformBuilder.yml b/.github/workflows/CrossPlatformBuilder.yml index f47940a..8bd61f8 100644 --- a/.github/workflows/CrossPlatformBuilder.yml +++ b/.github/workflows/CrossPlatformBuilder.yml @@ -3,6 +3,10 @@ name: Cross-Platform Python Package Build on: push: branches: [ main ] + pull_request: + branches: [ main ] + + workflow_dispatch: # Utilizes repository-stored secrets for MATLAB's batch-token licensing env: @@ -16,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - release: [R2024a, R2024b] + release: [R2024b, R2025a] # The type of runner that the job will run on runs-on: ${{ matrix.os }} diff --git a/.github/workflows/ToolboxDistribution.yml b/.github/workflows/ToolboxDistribution.yml index 16d037b..031fe35 100644 --- a/.github/workflows/ToolboxDistribution.yml +++ b/.github/workflows/ToolboxDistribution.yml @@ -3,6 +3,10 @@ name: Compile, Test and Release toolbox on: push: branches: [ main ] + pull_request: + branches: [ main ] + + workflow_dispatch: jobs: # This workflow contains two jobs called "compile-and-test-mex" and "create-and-release-toolbox" @@ -68,7 +72,7 @@ jobs: tasks: packageToolbox # The packaged toolbox is distributed as a GitHub release - - name: Create relase and upload asset + - name: Create release and upload asset run: | gh release create ${{github.run_id}} --title "Cross-Platform Array Product Toolbox" toolbox.mltbx env: diff --git a/AzureDevOps/CrossPlatformBuilder.yml b/AzureDevOps/CrossPlatformBuilder.yml index fcc8777..efd92aa 100644 --- a/AzureDevOps/CrossPlatformBuilder.yml +++ b/AzureDevOps/CrossPlatformBuilder.yml @@ -3,24 +3,24 @@ jobs: # Matrix strategy to run builds across different OS and MATLAB release combinations strategy: matrix: - linux-R2024a: - imageName: ubuntu-latest - release: R2024a linux-R2024b: imageName: ubuntu-latest release: R2024b - mac-R2024a: - imageName: macOS-latest - release: R2024a + linux-R2025a: + imageName: ubuntu-latest + release: R2025a mac-R2024b: imageName: macOS-latest release: R2024b - windows-R2024a: - imageName: windows-latest - release: R2024a + mac-R2025a: + imageName: macOS-latest + release: R2025a windows-R2024b: imageName: windows-latest - release: R2024b + release: R2024b + windows-R2025a: + imageName: windows-latest + release: R2025a pool: vmImage: $(imageName) steps: diff --git a/AzureDevOps/ToolboxDistribution.yml b/AzureDevOps/ToolboxDistribution.yml index c8d2069..1989664 100644 --- a/AzureDevOps/ToolboxDistribution.yml +++ b/AzureDevOps/ToolboxDistribution.yml @@ -63,7 +63,7 @@ jobs: # The packaged toolbox is distributed as a GitHub release - task: GitHubRelease@1 inputs: - gitHubConnection: MathWorks + gitHubConnection: advanced-ci-configuration-examples title: "Cross-Platform Array Product Toolbox" assets: 'toolbox.mltbx' tagSource: 'userSpecifiedTag' diff --git a/Jenkins/CrossPlatformBuilder.yml b/Jenkins/CrossPlatformBuilder.yml index a82bb7e..61d2eda 100644 --- a/Jenkins/CrossPlatformBuilder.yml +++ b/Jenkins/CrossPlatformBuilder.yml @@ -11,7 +11,7 @@ pipeline { } axis { name 'RELEASE' - values 'R2024a', 'R2024b' + values 'R2024b', 'R2025a' } } stages {