From 5c9df7bc7ad7287eed6a08c1831144562f8b8a4b Mon Sep 17 00:00:00 2001
From: liuhaitao <liuhaitao@xiaomi.com>
Date: Sat, 28 Mar 2020 23:36:17 +0800
Subject: [PATCH] Use new docker image container and add xtensa arch build
 support

Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
---
 .github/actions/ci-container/action.yaml | 20 ++++++++++++++++++
 .github/workflows/main.yml               | 26 ++++++++++++++++++------
 2 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 .github/actions/ci-container/action.yaml

diff --git a/.github/actions/ci-container/action.yaml b/.github/actions/ci-container/action.yaml
new file mode 100644
index 000000000..f2cc6146d
--- /dev/null
+++ b/.github/actions/ci-container/action.yaml
@@ -0,0 +1,20 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: ci-container
+runs:
+  using: 'docker'
+  image: 'docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux'
+  args:
+    - "-c"
+    - ${{ inputs.run }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad2c15aef..aafc70356 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,6 @@ on:
 jobs:
   check:
     runs-on: ubuntu-18.04
-    container: liuguo09/ubuntu-nuttx:18.04
 
     steps:
     - name: Checkout apps repo
@@ -45,11 +44,12 @@ jobs:
 
   build:
     runs-on: ubuntu-18.04
-    container: liuguo09/ubuntu-nuttx:18.04
+    env:
+      DOCKER_BUILDKIT: 1
 
     strategy:
       matrix:
-        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim]
+        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86-xtensa, sim]
 
     steps:
     - name: Checkout apps repo
@@ -76,7 +76,21 @@ jobs:
         repository: apache/incubator-nuttx-testing
         path: testing
 
+    - name: Docker Login
+      uses: azure/docker-login@v1
+      with:
+        login-server: docker.pkg.github.com
+        username: ${GITHUB_ACTOR}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Run Pull Container
+      uses: ./apps/.github/actions/ci-container
+
     - name: Run builds
-      run: |
-        cd testing
-        ./cibuild.sh -x testlist/${{matrix.boards}}.dat
+      uses: ./apps/.github/actions/ci-container
+      env:
+        BLOBDIR: /tools/blobs
+      with:
+        run: |
+          cd testing
+          ./cibuild.sh -x testlist/${{matrix.boards}}.dat