Fix failing GitHub Actions pipelines

epaganon · epaganon · commit 146bf699a1ff · 2025-05-14T08:38:39.000Z
diff --git a/.github/actions/build-test-and-publish-matlab-deps/action.yml b/.github/actions/build-test-and-publish-matlab-deps/action.yml
@@ -31,7 +31,7 @@ runs:
   steps:
     # Invalid combination would error out.
     - name: Invalid combination of should_add_latest_tag set to true and is_default_os set to false
-      if: ${{ inputs.should_add_latest_tag == true && inputs.is_default_os == false }}
+      if: ${{ inputs.should_add_latest_tag == 'true' && inputs.is_default_os == 'false' }}
       shell: bash
       run: |
         echo "Invalid situation detected. A workflow marked as latest must also set the default os to be true. "
@@ -56,7 +56,7 @@ runs:
 
     # Example tags: r2023a-ubuntu20.04, R2023a-ubuntu20.04
     - name: Build Image
-      if: ${{ inputs.should_add_latest_tag == false && inputs.is_default_os == false }}
+      if: ${{ inputs.should_add_latest_tag == 'false' && inputs.is_default_os == 'false' }}
       uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker_build_context }}
@@ -68,7 +68,7 @@ runs:
 
     # Example tags: r2023a-ubuntu20.04, R2023a-ubuntu20.04, r2023a, R2023a
     - name: Build Image for latest OS
-      if: ${{ inputs.should_add_latest_tag == false && inputs.is_default_os == true }}
+      if: ${{ inputs.should_add_latest_tag == 'false' && inputs.is_default_os == 'true' }}
       uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker_build_context }}
@@ -82,7 +82,7 @@ runs:
 
     # Example tags: r2023a-ubuntu20.04, R2023a-ubuntu20.04, r2023a, R2023a, latest
     - name: Build Image with latest Tag for latest OS
-      if: ${{ inputs.should_add_latest_tag == true && inputs.is_default_os == true }}
+      if: ${{ inputs.should_add_latest_tag == 'true' && inputs.is_default_os == 'true' }}
       uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker_build_context }}
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -71,7 +71,7 @@ For example:
 ...
     with:
         docker_build_context: './matlab-deps/r2023a/ubuntu20.04'
-        base_image_name: mathworks/matlab-deps
+        image_name: mathworks/matlab-deps
         matlab_release_tag: 'r2023a'
         os_info_tag: 'ubuntu20.04'
         should_add_latest_tag: true
@@ -92,7 +92,7 @@ Each workflow must set the following `inputs` to the `reusable-workflow`:
         description: 'Relative path to folder with Dockerfile. Ex: ./matlab-deps/r2023a/ubuntu20.04 '
         required: true
         type: string
-      base_image_name:
+      image_name:
         description: 'Name of base image. Example: mathworks/matlab-deps'
         required: true
         type: string
diff --git a/.github/workflows/build-test-and-publish-matlab-deps.yml b/.github/workflows/build-test-and-publish-matlab-deps.yml
@@ -146,5 +146,5 @@ jobs:
           matlab_release_tag: ${{ matrix.input.release_tag }}
           os_info_tag: ${{ matrix.input.os_info_tag }}
           is_default_os: ${{ matrix.input.os_info_tag == matrix.input.default_os }}
-          should_add_latest_tag: ${{ (matrix.input.os_info_tag == matrix.input.default_os) && (matrix.input.release_tag == github.env.latest_release) }}
+          should_add_latest_tag: ${{ matrix.input.os_info_tag == matrix.input.default_os && matrix.input.release_tag == env.latest_release }}
           test_file_path: tests/matlab-deps/${{ matrix.input.test_file_name }}
diff --git a/.github/workflows/build-test-and-publish-matlab.yml b/.github/workflows/build-test-and-publish-matlab.yml
@@ -80,7 +80,7 @@ jobs:
           variant: matlab
           matlab_release: ${{ matrix.matlab_release }}
           matlab_license_file: ${{ secrets.MATLAB_LICENSE_FILE_R2024B }}
-          base_image_name: "mathworks/matlab"
+          image_name: "mathworks/matlab"
 
       - name: Build, Test, and Publish MATLAB Deep Learning
         # Run this step even if the previous step failed
@@ -90,7 +90,7 @@ jobs:
           variant: matlab-deep-learning
           matlab_release: ${{ matrix.matlab_release }}
           matlab_license_file: ${{ secrets.MATLAB_LICENSE_FILE_R2024B }}
-          base_image_name: "mathworks/matlab-deep-learning"
+          image_name: "mathworks/matlab-deep-learning"
 
       - name: Fail job if any tests failed
         if: steps.build-test-and-publish-matlab-to-dockerhub.outcome == 'failure'
diff --git a/.github/workflows/matlab-runtime-deps-r2023b-ubuntu22.04.yml b/.github/workflows/matlab-runtime-deps-r2023b-ubuntu22.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './matlab-runtime-deps/r2023b/ubuntu22.04'
-        base_image_name: mathworks/matlab-runtime-deps
-        matlab_release_tag: 'r2023b'
-        os_info_tag: 'ubuntu22.04'
-        is_default_os: true
-        should_add_latest_tag: false
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, and Publish MATLAB Runtime Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './matlab-runtime-deps/r2023b/ubuntu22.04'
+          image_name: mathworks/matlab-runtime-deps
+          matlab_release_tag: 'r2023b'
+          os_info_tag: 'ubuntu22.04'
+          is_default_os: true
+          should_add_latest_tag: false
diff --git a/.github/workflows/matlab-runtime-deps-r2024a-ubuntu22.04.yml b/.github/workflows/matlab-runtime-deps-r2024a-ubuntu22.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './matlab-runtime-deps/r2024a/ubuntu22.04'
-        base_image_name: mathworks/matlab-runtime-deps
-        matlab_release_tag: 'r2024a'
-        os_info_tag: 'ubuntu22.04'
-        is_default_os: true
-        should_add_latest_tag: false
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, and Publish MATLAB Runtime Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './matlab-runtime-deps/r2024a/ubuntu22.04'
+          image_name: mathworks/matlab-runtime-deps
+          matlab_release_tag: 'r2024a'
+          os_info_tag: 'ubuntu22.04'
+          is_default_os: true
+          should_add_latest_tag: false
diff --git a/.github/workflows/matlab-runtime-deps-r2024b-ubuntu24.04.yml b/.github/workflows/matlab-runtime-deps-r2024b-ubuntu24.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './matlab-runtime-deps/r2024b/ubuntu24.04'
-        base_image_name: mathworks/matlab-runtime-deps
-        matlab_release_tag: 'r2024b'
-        os_info_tag: 'ubuntu24.04'
-        is_default_os: true
-        should_add_latest_tag: true
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, and Publish MATLAB Runtime Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './matlab-runtime-deps/r2024b/ubuntu24.04'
+          image_name: mathworks/matlab-runtime-deps
+          matlab_release_tag: 'r2024b'
+          os_info_tag: 'ubuntu24.04'
+          is_default_os: true
+          should_add_latest_tag: true
diff --git a/.github/workflows/polyspace-deps-r2022b-ubuntu20.04.yml b/.github/workflows/polyspace-deps-r2022b-ubuntu20.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './polyspace-deps/r2022b/ubuntu20.04'
-        base_image_name: mathworks/polyspace-deps
-        matlab_release_tag: 'r2022b'
-        os_info_tag: 'ubuntu20.04'
-        is_default_os: true
-        should_add_latest_tag: false
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+    
+      - name: Build, and Publish Polyspace Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './polyspace-deps/r2022b/ubuntu20.04'
+          image_name: mathworks/polyspace-deps
+          matlab_release_tag: 'r2022b'
+          os_info_tag: 'ubuntu20.04'
+          is_default_os: true
+          should_add_latest_tag: false
diff --git a/.github/workflows/polyspace-deps-r2023a-ubuntu20.04.yml b/.github/workflows/polyspace-deps-r2023a-ubuntu20.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './polyspace-deps/r2023a/ubuntu20.04'
-        base_image_name: mathworks/polyspace-deps
-        matlab_release_tag: 'r2023a'
-        os_info_tag: 'ubuntu20.04'
-        is_default_os: true
-        should_add_latest_tag: false
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build, and Publish Polyspace Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './polyspace-deps/r2023a/ubuntu20.04'
+          image_name: mathworks/polyspace-deps
+          matlab_release_tag: 'r2023a'
+          os_info_tag: 'ubuntu20.04'
+          is_default_os: true
+          should_add_latest_tag: false
diff --git a/.github/workflows/polyspace-deps-r2023b-ubuntu22.04.yml b/.github/workflows/polyspace-deps-r2023b-ubuntu22.04.yml
@@ -18,13 +18,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-publish-image:
-    uses: ./.github/workflows/build-test-and-publish-dependencies-image.yml
-    secrets: inherit
-    with:
-        docker_build_context: './polyspace-deps/r2023b/ubuntu22.04'
-        base_image_name: mathworks/polyspace-deps
-        matlab_release_tag: 'r2023b'
-        os_info_tag: 'ubuntu22.04'
-        is_default_os: true
-        should_add_latest_tag: true
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+    
+      - name: Build, and Publish Polyspace Dependencies
+        uses: ./.github/actions/build-test-and-publish-matlab-deps
+        with:
+          docker_build_context: './polyspace-deps/r2023b/ubuntu22.04'
+          image_name: mathworks/polyspace-deps
+          matlab_release_tag: 'r2023b'
+          os_info_tag: 'ubuntu22.04'
+          is_default_os: true
+          should_add_latest_tag: true
diff --git a/tests/matlab-deps/test_awsbatch.py b/tests/matlab-deps/test_awsbatch.py
@@ -23,7 +23,7 @@
     "r2023b": "ubuntu22.04",
     "r2024a": "ubuntu22.04",
     "r2024b": "ubuntu22.04",
-    "r2025a": "ubuntu24.04",
+    "r2025a": "ubuntu22.04",
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"r2023b": "ubuntu22.04",`
`24`	`24`	`"r2024a": "ubuntu22.04",`
`25`	`25`	`"r2024b": "ubuntu22.04",`
`26`		`- "r2025a": "ubuntu24.04",`
	`26`	`+ "r2025a": "ubuntu22.04",`
`27`	`27`	`}`
`28`	`28`
`29`	`29`