diff options
| -rw-r--r-- | .github/workflows/pullrequest.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/push.yml | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4f99dbb2..df506555 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -19,32 +19,26 @@ jobs: efiarch: x64 makearch: x86_64 distro: efi-ci-f34 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f33 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f32 - libdir: /usr/lib64 - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f34 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f33 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f32 - libdir: /usr/lib steps: - name: Checkout @@ -57,8 +51,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 test || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test - 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 + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install echo 'results:' find /destdir -type f diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bab120ca..f902390d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,32 +20,26 @@ jobs: efiarch: x64 makearch: x86_64 distro: efi-ci-f34 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f33 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f32 - libdir: /usr/lib64 - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f34 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f33 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f32 - libdir: /usr/lib steps: - name: Checkout @@ -54,8 +48,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 test || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test - 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 + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all + make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install echo 'results:' find /destdir -type f |