[bootlin/training-materials updates] master: github: add workaround for checkout issue (720aa3d8)

Clément Léger clement.leger at bootlin.com
Mon May 23 13:47:05 CEST 2022


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/720aa3d8078aeff0b985fca7318791e40bc80a73

>---------------------------------------------------------------

commit 720aa3d8078aeff0b985fca7318791e40bc80a73
Author: Clément Léger <clement.leger at bootlin.com>
Date:   Mon May 23 11:02:16 2022 +0200

    github: add workaround for checkout issue
    
    There seems to be a bug with v2 action when used with Ubuntu 20-04 [1].
    Unfortunately, there is no solution yet and a worarkound should be
    used.
    
    [1] https://github.com/actions/checkout/issues/760
    
    Signed-off-by: Clément Léger <clement.leger at bootlin.com>


>---------------------------------------------------------------

720aa3d8078aeff0b985fca7318791e40bc80a73
 .github/actions/build-material-action/Dockerfile         | 4 ++++
 .github/actions/build-material-action/build_materials.sh | 5 +++++
 .github/workflows/training-materials.yml                 | 9 ---------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/actions/build-material-action/Dockerfile b/.github/actions/build-material-action/Dockerfile
index acb9fbc3..7f9c89f2 100644
--- a/.github/actions/build-material-action/Dockerfile
+++ b/.github/actions/build-material-action/Dockerfile
@@ -4,6 +4,10 @@ LABEL maintainer="Bootlin <feedback at bootlin.com>" \
       vendor="Bootlin" \
 description="Container with everything needed to build Bootlin training materials"
 
+COPY build_materials.sh /build_materials.sh
+
+ENTRYPOINT ["/build_materials.sh"]
+
 RUN dnf -y update && \
     dnf -y install \
 	dia \
diff --git a/.github/actions/build-material-action/build_materials.sh b/.github/actions/build-material-action/build_materials.sh
new file mode 100755
index 00000000..7609cd35
--- /dev/null
+++ b/.github/actions/build-material-action/build_materials.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -ex
+
+git config --global --add safe.directory $GITHUB_WORKSPACE
+make $*
diff --git a/.github/workflows/training-materials.yml b/.github/workflows/training-materials.yml
index b22562af..3d4ce0f4 100644
--- a/.github/workflows/training-materials.yml
+++ b/.github/workflows/training-materials.yml
@@ -6,7 +6,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-embedded-linux-slides.pdf
             full-embedded-linux-4d-slides.pdf
@@ -32,7 +31,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             embedded-linux-ng-agenda.pdf
             embedded-linux-ng-fr-agenda.pdf
@@ -44,7 +42,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-linux-kernel-slides.pdf
             full-linux-kernel-labs.pdf
@@ -59,7 +56,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-buildroot-slides.pdf
             full-buildroot-labs.pdf
@@ -77,7 +73,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-yocto-slides.pdf
             full-yocto-stm32-slides.pdf
@@ -99,7 +94,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-boot-time-slides.pdf
             full-boot-time-labs.pdf
@@ -114,7 +108,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-graphics-slides.pdf
             graphics-agenda.pdf
@@ -127,7 +120,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-autotools-slides.pdf
             full-autotools-labs.pdf
@@ -139,7 +131,6 @@ jobs:
       - uses: actions/checkout at v3
       - uses: ./.github/actions/build-material-action
         with:
-          entrypoint: /usr/bin/make
           args: >
             full-preempt-rt-slides.pdf
             full-preempt-rt-labs.pdf




More information about the training-materials-updates mailing list