Update CI

Author: xCuri0

.github/workflows/ReBarDxe.yml

@@ -11,10 +11,10 @@ env:
 
 jobs:
   rebardxe-windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     env:
-      TOOL_CHAIN_TAG: VS2019
+      TOOL_CHAIN_TAG: VS2022
 
     steps:
     - uses: actions/setup-python@v4.3.0
@@ -45,7 +45,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: 'tianocore/edk2'
-        ref: 'edk2-stable202208'
+        ref: 'edk2-stable202508'
         submodules: 'recursive'
 
     - name: Download RebarUEFI
@@ -63,14 +63,14 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: ReBarDxe (built on Windows)
-        path: ${{github.workspace}}/Build/ReBarUEFI/RELEASE_VS2019/X64/ReBarDxe.ffs
+        path: ${{github.workspace}}/Build/ReBarUEFI/RELEASE_VS2022/X64/ReBarDxe.ffs
 
 
   rebardxe-linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
-      TOOL_CHAIN_TAG: GCC5
+      TOOL_CHAIN_TAG: GCC
 
     steps:
     - uses: actions/setup-python@v4.3.0
@@ -80,7 +80,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: 'tianocore/edk2'
-        ref: 'edk2-stable202208'
+        ref: 'edk2-stable202508'
         submodules: 'recursive'
         path: '.'
 
@@ -90,7 +90,7 @@ jobs:
         path: './ReBarUEFI/'
 
     - name: Install dependencies
-      run: sudo apt install build-essential uuid-dev iasl git nasm  python-is-python3
+      run: sudo apt install build-essential uuid-dev iasl git nasm python-is-python3
 
     - name: Build Base Tools
       run: make -C ./BaseTools/
@@ -105,4 +105,4 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: ReBarDxe (built on Linux)
-        path: ${{github.workspace}}/Build/ReBarUEFI/RELEASE_GCC5/X64/ReBarDxe.ffs
+        path: ${{github.workspace}}/Build/ReBarUEFI/RELEASE_GCC/X64/ReBarDxe.ffs

ReBarDxe/buildffs.py

@@ -17,17 +17,18 @@
 buildtype = "RELEASE"
 
 
-def filesub(filep, f, r):
+def target_update(filep, p, v):
     # Read in the file
     with open(filep, 'r') as file :
-        filedata = file.read()
-
-    # Replace the target string
-    filedata = filedata.replace(f, r)
+        lines = file.read()
 
     # Write the file out again
     with open(filep, 'w') as file:
-        file.write(filedata)
+        for i, l in enumerate(lines.splitlines()):
+            if l.split('=')[0].strip() == p:
+                file.write(f"{p} = {v}\n")
+            else:
+                file.write(f"{l.rstrip()}\n")
 
 def set_bit(data, bit):
     """Sets a specific bit."""
@@ -51,9 +52,9 @@ def set_nx_compat_flag(pe):
     print("TOOL_CHAIN_TAG: ", os.environ['TOOL_CHAIN_TAG'])
 
     # setup Conf/target.txt
-    filesub("./Conf/target.txt", "DEBUG", os.environ['TARGET'])
-    filesub("./Conf/target.txt", "IA32", os.environ['TARGET_ARCH'])
-    filesub("./Conf/target.txt", "VS2015x86", os.environ['TOOL_CHAIN_TAG'])
+    target_update("./Conf/target.txt", "TARGET", os.environ['TARGET'])
+    target_update("./Conf/target.txt", "TARGET_ARCH", os.environ['TARGET_ARCH'])
+    target_update("./Conf/target.txt", "TOOL_CHAIN_TAG", os.environ['TOOL_CHAIN_TAG'])
 else:
     os.chdir("../..")