From e31379de9f4b55af61a9f407e01768330da57b71 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Mar 2021 21:26:02 -0500 Subject: CI: try to update submodules Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 1 + .github/workflows/push.yml | 32 ++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 2821b2f4..640c3192 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -56,6 +56,7 @@ jobs: - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} id: build run: | + make update || : make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install echo 'results:' diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f4e59355..c2b97288 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -16,10 +16,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all id: build - name: Install in /destdir - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install id: install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 @@ -35,10 +39,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all id: build - name: Install in /destdir - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install id: install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 @@ -54,10 +62,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all id: build - name: Install in /destdir - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install id: install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 @@ -73,10 +85,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all id: build - name: Install in /destdir - run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install + run: | + make update || : + make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install id: install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 -- cgit v1.2.3