From 46524b6182e327a896b3c0f5114880ee120e8713 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 2 Aug 2024 16:44:05 -0400 Subject: [PATCH 1/3] CI: use checkout@v4 Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 7a8073844..4c27c1277 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger) ref: ${{ github.event.pull_request.head.sha }} @@ -154,7 +154,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger) ref: ${{ github.event.pull_request.head.sha }} From d850dfff9794b78c1e9aa599e7406c36362606ad Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 2 Aug 2024 17:02:26 -0400 Subject: [PATCH 2/3] CI: work around ownership issue on github "make update" with newer distros is giving us: fatal: detected dubious ownership in repository at '/__w/shim/shim' To add an exception for this directory, call: git config --global --add safe.directory /__w/shim/shim So that's exactly what I'm trying. Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4c27c1277..6c41f046b 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -82,6 +82,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 submodules: recursive + - name: Work around directory ownership issue + id: ignore-ownership + run: | + git config --global --add safe.directory /__w/shim/shim - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} id: update-submodules run: | @@ -160,6 +164,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 submodules: recursive + - name: Work around directory ownership issue + id: ignore-ownership + run: | + git config --global --add safe.directory /__w/shim/shim - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} id: update-submodules run: | From 97fd3a0e697e6ba8ea5a40528ad70b55e904bb7e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 12 Dec 2024 14:04:03 -0500 Subject: [PATCH 3/3] Update fedora CI targets This updates CI targets for Fedora distros to newer releases. It also disables IA32 builds on f40 and f41. Something is broken in the include files for the ia32-on-x64 buildroot, and I don't think anyone is actually doing ia32-on-x64 builds in the wild anyway. At the same time, ia32 is pretty much dead to begin with. This takes the test out. Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 38 ++++++++++++------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 6c41f046b..dfae65063 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -22,57 +22,57 @@ jobs: efiarch: aa64 gccarch: aarch64 makearch: aarch64 - distro: f36 + distro: f41 - arch: amd64 efiarch: aa64 gccarch: aarch64 makearch: aarch64 - distro: f35 + distro: f40 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f36 + distro: f41 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f35 + distro: f40 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f34 + distro: f39 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f36 + distro: f41 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f35 + distro: f40 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f34 + distro: f39 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f36 + distro: f41 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f35 + distro: f40 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f34 + distro: f39 steps: - name: Checkout @@ -122,15 +122,15 @@ jobs: - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f36 + distro: f41 - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f35 + distro: f40 - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f34 + distro: f39 - arch: amd64 efiarch: x64 makearch: x86_64 @@ -142,15 +142,7 @@ jobs: - arch: amd64 efiarch: ia32 makearch: ia32 - distro: f36 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: f35 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: f34 + distro: f39 - arch: amd64 efiarch: ia32 makearch: ia32