You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/02/25 12:43:46 UTC

[incubator-nuttx] branch master updated (fbc1da9 -> 4407589)

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from fbc1da9  xtensa: use swint to swith context
     new d437921  docker_linux.yml: Use docker actions to build docker.
     new 4407589  build.yml: Use v2 of the download-artifact action.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/build.yml        | 20 +++++++++++++++-----
 .github/workflows/docker_linux.yml | 37 ++++++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 20 deletions(-)

[incubator-nuttx] 01/02: docker_linux.yml: Use docker actions to build docker.

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit d437921f82d8b2b42c6f8c1621b533e8a5332625
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Thu Feb 24 21:17:25 2022 +0100

    docker_linux.yml: Use docker actions to build docker.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 .github/workflows/build.yml        | 16 +++++++++++++---
 .github/workflows/docker_linux.yml | 37 ++++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 73df4ed..2c13a5c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,6 +104,7 @@ jobs:
 
       - name: Tar sources
         run: tar zcf sources.tar.gz sources
+
       - name: Archive Source Bundle
         uses: actions/upload-artifact@v1
         with:
@@ -126,19 +127,23 @@ jobs:
         with:
           name: source-bundle
           path: .
+
       - name: Extract sources
         run: tar zxf sources.tar.gz
+
       - name: Docker Login
-        uses: azure/docker-login@v1
+        uses: docker/login-action@v1
         with:
-          login-server: ghcr.io
-          username: ${GITHUB_ACTOR}
+          registry: ghcr.io
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker Pull
         run: docker pull ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux
+
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
+
       - name: Run builds
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
@@ -152,6 +157,7 @@ jobs:
             cd sources/nuttx/tools/ci
             ./cibuild.sh -A -R -c testlist/${{matrix.boards}}.dat
             ccache -s
+
       - uses: actions/upload-artifact@v2
         with:
           name: linux-builds
@@ -170,8 +176,10 @@ jobs:
         with:
           name: source-bundle
           path: .
+
       - name: Extract sources
         run: tar zxf sources.tar.gz
+
       - name: Restore Tools Cache
         id: cache-tools
         uses: actions/cache@v2
@@ -183,6 +191,7 @@ jobs:
 
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
+
       - name: Run Builds
         run: |
           echo "::add-matcher::sources/nuttx/.github/gcc.json"
@@ -192,6 +201,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -A -R -c testlist/${{matrix.boards}}.dat
           ccache -s
+
       - uses: actions/upload-artifact@v2
         with:
           name: macos-builds
diff --git a/.github/workflows/docker_linux.yml b/.github/workflows/docker_linux.yml
index 83a7600..422bb84 100644
--- a/.github/workflows/docker_linux.yml
+++ b/.github/workflows/docker_linux.yml
@@ -39,25 +39,32 @@ jobs:
   push:
     runs-on: ubuntu-latest
     env:
-      DOCKER_BUILDKIT: 1
       IMAGE_TAG: ghcr.io/${{ github.repository }}/apache-nuttx-ci-linux
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
       - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Linux image
-        run: |
-          echo "Building Linux Image using cache from $IMAGE_TAG"
-
-          docker build \
-            --build-arg BUILDKIT_INLINE_CACHE=1 \
-            --cache-from $IMAGE_TAG \
-            --tag $IMAGE_TAG \
-            -f ./tools/ci/docker/linux/Dockerfile ./tools/ci/docker/
-        
+        uses: docker/build-push-action@v2
+        with:
+          context: tools/ci/docker/linux
+          load: true
+          tags: ${{ env.IMAGE_TAG }}
+
       - name: Push Linux image
-        if: (github.event_name == 'push') && (github.ref == 'refs/heads/master')
-        run: |
-          docker push $IMAGE_TAG
+        uses: docker/build-push-action@v2
+        with:
+          context: tools/ci/docker/linux
+          platforms: linux/amd64
+          push: ${{ github.ref == 'refs/heads/master' }}
+          tags: ${{ env.IMAGE_TAG }}

[incubator-nuttx] 02/02: build.yml: Use v2 of the download-artifact action.

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 44075893a768e057dbb1f60b5a60849c22c7f9b0
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Thu Feb 24 23:36:39 2022 +0100

    build.yml: Use v2 of the download-artifact action.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c13a5c..f825781 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -123,7 +123,7 @@ jobs:
 
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: source-bundle
           path: .
@@ -172,7 +172,7 @@ jobs:
         boards: [macos, sim-01, sim-02]
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: source-bundle
           path: .