From cbdf29976acc3cff38093e61adcab6ab618ecc1b Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 15 Dec 2022 23:34:38 +0000 Subject: [PATCH] Update to EDK2 latest * Also update yml to take care of deprecated items. * Also update readme badge per https://github.com/badges/shields/issues/8671. --- .github/workflows/linux_edk2.yml | 25 ++++++++----------------- Readme.md | 2 +- edk2 | 2 +- edk2-non-osi | 2 +- edk2-platforms | 2 +- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/linux_edk2.yml b/.github/workflows/linux_edk2.yml index 633ab14a..c9e50bc8 100644 --- a/.github/workflows/linux_edk2.yml +++ b/.github/workflows/linux_edk2.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2021, Pete Batard +# Copyright (c) 2021-2022, Pete Batard # SPDX-License-Identifier: BSD-3-Clause name: UEFI firmware - EDK2 build @@ -27,10 +27,12 @@ jobs: steps: - name: Set version id: set_version - run: echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}" + run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT - name: Set up Linux environment - run: sudo apt install acpica-tools gcc-aarch64-linux-gnu python3-distutils uuid-dev + run: | + sudo apt-get update + sudo apt-get install acpica-tools gcc-aarch64-linux-gnu - name: Check out EDK2 repositories uses: actions/checkout@v2 @@ -96,22 +98,11 @@ jobs: - name: Create release id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: softprops/action-gh-release@v1 with: draft: false prerelease: false - release_name: ${{ steps.set_version.outputs.version }} + token: ${{ secrets.GITHUB_TOKEN }} body: Raspberry Pi 4 UEFI Firmware ${{ steps.set_version.outputs.version }} tag_name: ${{ steps.set_version.outputs.version }} - - - name: Upload release assets - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: RPi4_UEFI_Firmware_${{ steps.set_version.outputs.version }}.zip - asset_name: RPi4_UEFI_Firmware_${{ steps.set_version.outputs.version }}.zip - asset_content_type: application/zip + files: RPi4_UEFI_Firmware_${{ steps.set_version.outputs.version }}.zip diff --git a/Readme.md b/Readme.md index 78b7b57a..40525e9b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ Raspberry Pi 4 UEFI Firmware Images =================================== -[![Build status](https://img.shields.io/github/workflow/status/pftf/RPi4/UEFI%20firmware%20-%20EDK2%20build.svg?style=flat-square)](https://github.com/pftf/RPi4/actions) +[![Build status](https://img.shields.io/github/actions/workflow/status/pftf/RPi4/linux_edk2.yml?branch=master&style=flat-square)](https://github.com/pftf/RPi4/actions) [![Github stats](https://img.shields.io/github/downloads/pftf/RPi4/total.svg?style=flat-square)](https://github.com/pftf/RPi4/releases) [![Release](https://img.shields.io/github/release-pre/pftf/RPi4?style=flat-square)](https://github.com/pftf/RPi4/releases) diff --git a/edk2 b/edk2 index 79f2734e..0adc35fc 160000 --- a/edk2 +++ b/edk2 @@ -1 +1 @@ -Subproject commit 79f2734e5a7bc2e5256eb0e599f45407855159c7 +Subproject commit 0adc35fccd59c8c5171273319ec899aa48fc2c35 diff --git a/edk2-non-osi b/edk2-non-osi index 0320db97..61662e85 160000 --- a/edk2-non-osi +++ b/edk2-non-osi @@ -1 +1 @@ -Subproject commit 0320db977fb27e63424b0953a3020bb81c89e8f0 +Subproject commit 61662e8596dd9a64e3372f9a3ba6622d2628607c diff --git a/edk2-platforms b/edk2-platforms index 958fc02b..20e07099 160000 --- a/edk2-platforms +++ b/edk2-platforms @@ -1 +1 @@ -Subproject commit 958fc02b1593cbabb39f4bd317f304f3ab6337de +Subproject commit 20e07099d8f11889d101dd710ca85001be20e179