Use zap light docker image (#13390)

Signed-off-by: Victor Morales <v.morales@samsung.com>
project-chip · Nov 24, 2023 · 4673235 · 4673235
1 parent bd18a8e
commit 4673235
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -26,26 +26,19 @@ jobs:
         name: ZAP Regeneration
         timeout-minutes: 60
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
+        container:
+            image: connectedhomeip/chip-build-zap:0.5.42
+        defaults:
+            run:
+                shell: sh
         if: github.actor != 'restyled-io[bot]'
 
         steps:
             - name: Checkout
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@v1
-              with:
-                node-version: '14.x'
-            - name: Use Java 
-              uses: actions/setup-java@v2
-              with:
-                distribution: 'zulu'
-                java-version: '11'
-                java-package: jre
-            - run: sudo apt-get update
-            - run: sudo apt-get install --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
             - name: Setup ZAP
               timeout-minutes: 5
               run: |

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -27,26 +27,19 @@ jobs:
         name: ZAP templates generation
         timeout-minutes: 60
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
+        container:
+            image: connectedhomeip/chip-build-zap:0.5.42
+        defaults:
+            run:
+                shell: sh
         if: github.actor != 'restyled-io[bot]'
 
         steps:
             - name: Checkout
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@v1
-              with:
-                node-version: '14.x'
-            - name: Use Java
-              uses: actions/setup-java@v2
-              with:
-                distribution: 'zulu'
-                java-version: '11'
-                java-package: jre
-            - run: sudo apt-get update
-            - run: sudo apt-get install --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
             - name: Setup ZAP
               timeout-minutes: 5
               run: |