Switch gnu-efi to new GitHub repo

* Also update workflow files
pbatard · May 15, 2024 · 4db51f7 · 4db51f7
1 parent 62f981c
commit 4db51f7
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 21 deletions.
diff --git a/.github/workflows/linux_gcc_edk2.yml b/.github/workflows/linux_gcc_edk2.yml
@@ -78,7 +78,7 @@ jobs:
         git clone --recursive https://github.com/tianocore/edk2.git
         make -C edk2/BaseTools
     - name: Checkout repository and submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -95,18 +95,18 @@ jobs:
         build -a ${{ matrix.arch }} -b ${{ env.BUILD_TYPE }} -t ${{ env.COMPILER }} -p EfiFsPkg/EfiFsPkg.dsc
         for f in Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi; do mv "$f" "${f%.efi}_${{ matrix.short }}.efi"; done
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name == 'push' }}
       with:
-        name: gcc_edk2
+        name: gcc_edk2_${{ matrix.short }}
         path: edk2/Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi
     - name: Display SHA-256
       if: startsWith(github.ref, 'refs/tags/')
       run: |
         mv edk2/Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi .
         sha256sum *.efi
     - name: Create release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -129,8 +129,25 @@ jobs:
         done
         printf "<hr></pre>\n  </body>\n</html>\n" >> web/${{ matrix.short }}/index.html
     - name: Upload web artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: web_files
+        name: web_files_${{ matrix.arch }}
         path: web/*/index.html
+
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        with:
+          name: gcc_edk2
+          delete-merged: true
+      - name: Merge Web Artifacts
+        uses: actions/upload-artifact/merge@v4
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: web_files
+          delete-merged: true
diff --git a/.github/workflows/linux_gcc_gnu-efi.yml b/.github/workflows/linux_gcc_gnu-efi.yml
@@ -50,7 +50,7 @@ jobs:
 
     steps:
     - name: Checkout repository and submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -64,8 +64,18 @@ jobs:
     - name: Build drivers
       run: make ARCH=${{ matrix.arch }} CROSS_COMPILE=${{ matrix.tuple }}
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name == 'push' }}
       with:
-        name: gcc_gnu-efi
+        name: gcc_gnu-efi_${{ matrix.arch }}
         path: src/*.efi
+
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: gcc_gnu-efi
+          delete-merged: true
diff --git a/.github/workflows/windows_msvc_edk2.yml b/.github/workflows/windows_msvc_edk2.yml
@@ -72,7 +72,7 @@ jobs:
         cd edk2
         call edksetup.bat rebuild
     - name: Checkout repository and submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -94,8 +94,18 @@ jobs:
         call build -a ${{ matrix.arch }} -b ${{ env.BUILD_TYPE }} -t ${{ env.COMPILER }} -p EfiFsPkg/EfiFsPkg.dsc
         for %%f in (Build\EfiFs\${{ env.BUILD_TYPE }}_${{ env.COMPILER }}\${{ matrix.arch }}\*.efi) do ren "%%~f" "%%~nf_${{ matrix.short }}%%~xf"
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name == 'push' }}
       with:
-        name: msvc_edk2
+        name: msvc_edk2_${{ matrix.short }}
         path: edk2/Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi
+
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: msvc_edk2
+          delete-merged: true
diff --git a/.github/workflows/windows_msvc_gnu-efi.yml b/.github/workflows/windows_msvc_gnu-efi.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository and submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -44,14 +44,24 @@ jobs:
         git apply ..\0001-GRUB-fixes.patch
         cd ..
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1
+      uses: microsoft/setup-msbuild@v2
     - name: Build drivers
       run: |
         msbuild efifs.sln /m /p:Configuration=Debug,Platform=${{ matrix.arch }}
         msbuild efifs.sln /m /p:Configuration=Release,Platform=${{ matrix.arch }}
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name == 'push' }}
       with:
-        name: msvc_gnu-efi
+        name: msvc_gnu-efi_${{ matrix.arch }}
         path: ${{ matrix.arch }}/Release/*.efi
+
+  merge-artifacts:
+    runs-on: windows-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: msvc_gnu-efi
+          delete-merged: true
diff --git a/.gitmodules b/.gitmodules
@@ -4,5 +4,4 @@
 	ignore = dirty
 [submodule "gnu-efi"]
 	path = gnu-efi
-	url = git://git.code.sf.net/p/gnu-efi/code
-	ignore = dirty
+	url = https://github.com/ncroxon/gnu-efi.git
diff --git a/Make.common b/Make.common
@@ -125,8 +125,8 @@ ifeq (, $(shell which $(CC)))
   $(error The selected compiler ($(CC)) was not found)
 endif
 
-GCCVERSION     := $(shell $(CC) -dumpversion | cut -f1 -d.)
-GCCMINOR       := $(shell $(CC) -dumpversion | cut -f2 -d.)
+GCCVERSION     := $(shell $(CC) -dumpversion | sed -e 's/-win32/.0/' | cut -f1 -d.)
+GCCMINOR       := $(shell $(CC) -dumpversion | sed -e 's/-win32/.0/' | cut -f2 -d.)
 GCCMACHINE     := $(shell $(CC) -dumpmachine)
 GCCNEWENOUGH   := $(shell ( [ $(GCCVERSION) -gt "4" ]        \
                           || ( [ $(GCCVERSION) -eq "4" ]     \

diff --git a/gnu-efi b/gnu-efi