diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-06 10:49:33 -0500 |
|---|---|---|
| committer | Jan Setje-Eilers <73182357+jsetje@users.noreply.github.com> | 2021-03-09 13:52:53 -0800 |
| commit | bb6dece33c39bd332f3b7e84b851dd7c306b360d (patch) | |
| tree | 3a7b61074d6c7667e566769fef2dd1d5034cd493 | |
| parent | e31379de9f4b55af61a9f407e01768330da57b71 (diff) | |
| download | efi-boot-shim-bb6dece33c39bd332f3b7e84b851dd7c306b360d.tar.gz efi-boot-shim-bb6dece33c39bd332f3b7e84b851dd7c306b360d.zip | |
CI: show our compilation when it fails
We've been using "make -s", silent mode, which doesn't show us what
commands were invoked. Silent make means we can't see what goes wrong
when the wrong compiler or linker is getting invoked, or when it's being
invoked wrong.
This changes the CI to run it again without -s when it fails.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | .github/workflows/pullrequest.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/push.yml | 32 |
2 files changed, 10 insertions, 26 deletions
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 640c3192..15f4e9b3 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -57,8 +57,8 @@ jobs: 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 + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install echo 'results:' find /destdir -type f # - name: Archive production artifacts diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c2b97288..ed8f856f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -16,15 +16,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - 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 update || : - make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - id: install + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 # with: @@ -39,15 +35,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - 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 update || : - make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - id: install + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 # with: @@ -62,15 +54,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - 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 update || : - make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - id: install + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 # with: @@ -85,15 +73,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Do the build - 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 update || : - make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - id: install + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + make -s PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install # - name: Archive production artifacts # uses: actions/upload-artifact@v2 # with: |