[FB] Workflow | Remove buildjet

Author: surapunoyousei

.github/workflows/daily-build-with-update.yml

@@ -63,61 +63,22 @@ jobs:
 
 #? Original branding of the code is official
 #? It seems in PGO build, branding is not important in NOT deploying binary
-  build-win-x86_64-profgen:
+  Part1-win-x86_64-build-with-profgen-zstd:
     uses: ./.github/workflows/windows-build.yml
     with:
       profgen: true
       aarch64: false
       zstd: true
 
-  win-x86_64-gen-profdata-and-jarlog:
-    needs: build-win-x86_64-profgen
-    runs-on: windows-2022
-
-    steps:
-    - uses: actions/download-artifact@v3
-      name: Download artifact 📥
-      with:
-        name: floorp-windows-x86_64-build-with-profgen-zstd
-        path: C:\artifact
-
-    - name:  Unpack artifact
-      run: |
-        cd C:\artifact
-        zstd -d floorp-*.tar.zst
-        7z x floorp-*.tar
-
-    - uses: actions/checkout@v3
-      name: Clone 🧬
-      with:
-        submodules: 'recursive'
-
-    - name: Setup 🪛
-      run: |
-        (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe","C:\MozillaBuildSetup-Latest.exe")
-        C:\MozillaBuildSetup-Latest.exe /S | out-null
-
-    - name: Generate 🔄
-      run: |
-        $Env:USE_MINTTY = "0"
-
-        $workspace_dir = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\","/"
-        echo "cd $workspace_dir" '' >> mozilla-build-run.sh
-        echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
-        echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
-        echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/floorp/floorp.exe' '' >> mozilla-build-run.sh
-        C:\mozilla-build\start-shell.bat $workspace_dir\mozilla-build-run.sh
-
-    - name: Publish 🎁
-      uses: actions/upload-artifact@v3
-      with:
-        name: floorp-windows-x86_64-profdata-and-jarlog
-        path: |
-          merged.profdata
-          en-US.log
+  Part2-win-x86_64-gen-profdata-and-jarlog:
+    needs: Part1-win-x86_64-build-with-profgen-zstd
+    uses: ./.github/workflows/window-generate-profile-data-and-jarlog.yml
+    with:
+     browser-artifact-name: floorp-windows-x86_64-build-with-profgen-zstd
+     arch: x86_64
 
-  build-win-x86_64-with-profdata-and-jarlog:
-    needs: [win-x86_64-gen-profdata-and-jarlog,get-buildid]
+  Part3-win-x86_64-build-with-profdata-and-jarlog:
+    needs: [Part2-win-x86_64-gen-profdata-and-jarlog ,get-buildid]
     uses: ./.github/workflows/windows-build.yml
     with:
       aarch64: false
@@ -127,8 +88,8 @@ jobs:
       out_artifact_name: please-use-this-floorp-windows-x86_64-package-build-with-profdata-and-jarlog
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
 
-  win-x86_64-gen-update-xml:
-    needs: [get-display-version, get-buildid, get-inside-version,build-win-x86_64-with-profdata-and-jarlog]
+  Part4-win-x86_64-gen-update-xml:
+    needs: [get-display-version, get-buildid, get-inside-version,Part3-win-x86_64-build-with-profdata-and-jarlog]
     runs-on: ubuntu-latest
     steps:
     - name: generate update XML file
@@ -155,8 +116,8 @@ jobs:
         INSDVER: ${{needs.get-inside-version.outputs.inside-version}}
         BUILDID: ${{needs.get-buildid.outputs.buildids}}
         GHREPO: ${{github.repository}}
-        MAR_NAME: ${{needs.build-win-x86_64-with-profdata-and-jarlog.outputs.mar_name}}
-        MAR_SIZE: ${{needs.build-win-x86_64-with-profdata-and-jarlog.outputs.mar_size}}
+        MAR_NAME: ${{needs.Part3-win-x86_64-build-with-profdata-and-jarlog.outputs.mar_name}}
+        MAR_SIZE: ${{needs.Part3-win-x86_64-build-with-profdata-and-jarlog.outputs.mar_size}}
 
     - name: Publish 🎁
       uses: actions/upload-artifact@v3
@@ -166,7 +127,7 @@ jobs:
           WINNT-x86_64.xml
 
 #----------------------------------------- LINUX -----------------------------------------#
-  build-linux-x86_64-PGO:
+  Part1-build-linux-x86_64-PGO:
     uses: ./.github/workflows/linux-build.yml
     needs: [get-buildid]
     with:
@@ -175,9 +136,9 @@ jobs:
       mar: true
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
 
-  linux-x86_64-gen-update-xml:
+  Part2-linux-x86_64-gen-update-xml:
     runs-on: 'ubuntu-latest'
-    needs: [build-linux-x86_64-PGO,get-display-version,get-inside-version,get-buildid]
+    needs: [Part1-build-linux-x86_64-PGO, get-display-version, get-inside-version, get-buildid]
     steps:
       - name: generate update XML file
         run: |
@@ -203,8 +164,8 @@ jobs:
           INSDVER: ${{needs.get-inside-version.outputs.inside-version}}
           BUILDID: ${{needs.get-buildid.outputs.buildids}}
           GHREPO: ${{github.repository}}
-          MAR_NAME: ${{needs.build-linux-x86_64-PGO.outputs.mar_name}}
-          MAR_SIZE: ${{needs.build-linux-x86_64-PGO.outputs.mar_size}}
+          MAR_NAME: ${{needs.Part1-build-linux-x86_64-PGO.outputs.mar_name}}
+          MAR_SIZE: ${{needs.Part1-build-linux-x86_64-PGO.outputs.mar_size}}
       - name: Publish 🎁
         uses: actions/upload-artifact@v3
         with:
@@ -214,15 +175,15 @@ jobs:
 
 #----------------------------------------- macOS -----------------------------------------#
 
-  build-mac-universal-profgen:
+  Part1-macOS-Universal-build-with-profgen:
     uses: ./.github/workflows/macOS-Universal.yml
     with:
       profgen: true
     secrets:
       MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }}
 
-  mac-universal-gen-profdata-and-jarlog:
-    needs: [build-mac-universal-profgen]
+  Part2-macOS-Universal-gen-profdata-and-jarlog:
+    needs: [Part1-macOS-Universal-build-with-profgen]
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
@@ -305,19 +266,19 @@ jobs:
             merged.profdata
             en-US.log
 
-  build-mac-universal-with-profdata:
+  Part3-macOS-Universal-build-with-profdata-and-jarlog:
     uses: ./.github/workflows/macOS-Universal.yml
-    needs: [get-buildid, mac-universal-gen-profdata-and-jarlog]
+    needs: [get-buildid, Part2-macOS-Universal-gen-profdata-and-jarlog]
     with:
       build-with-profdata-and-jarlog: true
       beta: true
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
     secrets:
       MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }}
 
-  create-mac-universal-artifact:
+  Part4-macOS-Universal-package-and-sign:
     uses: ./.github/workflows/macOS-integration.yml
-    needs: [get-buildid, get-display-version, get-inside-version, build-mac-universal-with-profdata]
+    needs: [get-buildid, get-display-version, get-inside-version, Part3-macOS-Universal-build-with-profdata-and-jarlog]
     with:
       beta: true
       mar: true
@@ -336,7 +297,7 @@ jobs:
 
 ##################################################################### Deployments #######################################################################################################
   Deployments:
-    needs: [get-display-version, get-buildid, get-inside-version, linux-x86_64-gen-update-xml, win-x86_64-gen-update-xml, create-mac-universal-artifact]
+    needs: [get-display-version, get-buildid, get-inside-version, Part2-linux-x86_64-gen-update-xml, Part4-win-x86_64-gen-update-xml, Part4-macOS-Universal-package-and-sign]
     runs-on: ubuntu-latest
     steps:
 

.github/workflows/deployments.yml

@@ -17,11 +17,6 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
-      buildjet:
-        description: 'Buildjet'
-        type: boolean
-        required: true
-        default: true
       release-note-url:
         description: 'Release Note URL'
         type: string
@@ -82,7 +77,6 @@ jobs:
       profgen: true
       aarch64: false
       zstd: true
-      buildjet: ${{ inputs.buildjet }}
 
   Part2-win-x86_64-gen-profdata-and-jarlog:
     needs: Part1-win-x86_64-build-with-profgen-zstd
@@ -97,7 +91,6 @@ jobs:
     with:
       aarch64: false
       beta: false
-      buildjet: ${{ inputs.buildjet }}
       profdata_jarlog_artifact_name: "floorp-windows-x86_64-profdata-and-jarlog"
       out_artifact_name: please-use-this-floorp-windows-x86_64-package-build-with-profdata-and-jarlog
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
@@ -113,7 +106,6 @@ jobs:
       aarch64: false
       build32bit: true
       beta: false
-      buildjet: ${{ inputs.buildjet }}
       out_artifact_name: please-use-this-floorp-windows-x86-package-build-with-profdata-and-jarlog
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
       release-note-url: ${{ inputs.release-note-url }}
@@ -128,7 +120,6 @@ jobs:
       aarch64: false
       beta: false
       mar: true
-      buildjet: ${{ inputs.buildjet }}
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
       release-note-url: ${{ inputs.release-note-url }}
       release-note-url-ja: ${{ inputs.release-note-url-ja }}
@@ -141,7 +132,6 @@ jobs:
       aarch64: true
       beta: false
       mar: true
-      buildjet: ${{ inputs.buildjet }}
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}
       release-note-url: ${{ inputs.release-note-url }}
       release-note-url-ja: ${{ inputs.release-note-url-ja }}
@@ -154,7 +144,6 @@ jobs:
     uses: ./.github/workflows/macOS-Universal.yml
     with:
       profgen: true
-      buildjet: ${{ inputs.buildjet }}
     secrets:
       MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }}
 
@@ -246,7 +235,6 @@ jobs:
     uses: ./.github/workflows/macOS-Universal.yml
     needs: [get-buildid,  Part2-macOS-Universal-gen-profdata-and-jarlog]
     with:
-      buildjet: ${{ inputs.buildjet }}
       build-with-profdata-and-jarlog: true
       beta: false
       MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}

.github/workflows/linux-build.yml

@@ -6,7 +6,6 @@
 # © 2023 Floorp Projects & Contributors
 
 #! SELF HOST DOES NOT SUPPORTED
-#TODO! buildjet config not implemented
 #TODO: separate Publish to other workflow
 
 #? On linux x86_64 build, pgo build is enabled on default.
@@ -33,11 +32,6 @@ on:
       mar:
         type: boolean
         default: false
-      #? If you want to ALWAYS build with buildjet, do default to true
-      buildjet:
-        type: boolean
-        default: false
-      #? buildjet cache also is, but idk how to use on sccache
       MOZ_BUILD_DATE:
         type: string
         default: ""
@@ -59,7 +53,7 @@ on:
 
 jobs:
   linux-build:
-    runs-on: ${{fromJson('["ubuntu-latest","buildjet-16vcpu-ubuntu-2204"]')[inputs.buildjet]}}
+    runs-on: ubuntu-latest
     outputs:
       mar_name: ${{steps.gen-mar.outputs.MAR_NAME}}
       mar_size: ${{steps.gen-mar.outputs.MAR_SIZE}}
@@ -75,13 +69,6 @@ jobs:
         sudo perl -p -i -e 's%(deb(?:-src|)\s+)https?://(?!archive\.canonical\.com|security\.ubuntu\.com)[^\s]+%$1http://archive.ubuntu.com/ubuntu/%' /etc/apt/sources.list
         sudo apt update
 
-    #! ON UBUNTU RUNNER
-    - name: Setup Disk & Swap Space 💿
-      if: ${{ !inputs.buildjet }}
-      run: |
-        chmod +x .github/workflows/src/disk_swap_for_github_runner.sh
-        .github/workflows/src/disk_swap_for_github_runner.sh
-
     - name: Prepare cross compiler (aarch64)⚒
       if: ${{ inputs.aarch64 }}
       run: |

.github/workflows/macOS-Universal.yml

@@ -6,7 +6,6 @@
 # © 2023 Floorp Projects & Contributors
 
 #! SELF HOST DOES NOT SUPPORTED
-#TODO! buildjet config not implemented
 #TODO: separate Publish to other workflow
 
 name: "(A) ⚒ macOS Universal Build"
@@ -31,11 +30,6 @@ on:
       MOZ_BUILD_DATE:
         type: string
         default: ""
-      #? If you want to ALWAYS build with buildjet, do default to true
-      buildjet:
-        type: boolean
-        default: false
-      #? buildjet cache also is, but idk how to use on sccache
       release-note-url:
         type: string
         required: false
@@ -65,18 +59,13 @@ on:
       MOZ_BUILD_DATE:
         type: string
         default: ""
-      #? If you want to ALWAYS build with buildjet, do default to true
-      buildjet:
-        type: boolean
-        default: false
-      #? buildjet cache also is, but idk how to use on sccache
 
 jobs:
   mac-build:
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
-        runs-on: ${{ fromJson('[["ubuntu-latest"], ["buildjet-16vcpu-ubuntu-2204"]]')[inputs.buildjet] }}
+        runs-on: ["ubuntu-latest"]
         arch: [x86_64, aarch64]
     steps:
     - name: Use Node.js
@@ -113,13 +102,6 @@ jobs:
         repository: Floorp-Projects/l10n-central
         path: l10n-central
 
-    #! ON UBUNTU RUNNER
-    - name: Setup Disk & Swap Space 💿
-      if: matrix.runs-on != 'buildjet-16vcpu-ubuntu-2204'
-      run: |
-        chmod +x .github/workflows/src/disk_swap_for_github_runner.sh
-        .github/workflows/src/disk_swap_for_github_runner.sh
-
     - name: Configure sccache
       uses: actions/github-script@v6
       with:

.github/workflows/macOS-integration.yml

@@ -6,7 +6,6 @@
 # © 2023 Floorp Projects & Contributors
 
 #! SELF HOST DOES NOT SUPPORTED
-#TODO! buildjet config not implemented
 #TODO: separate Publish to other workflow
 
 on:

.github/workflows/windows-build.yml

@@ -6,7 +6,6 @@
 # © 2023 Floorp Projects & Contributors
 
 #! SELF HOST DOES NOT SUPPORTED
-#TODO! buildjet config not implemented
 #TODO: separate Publish to other workflow
 
 #! aarch64 PGO can maybe not comportable with pgo
@@ -51,11 +50,6 @@ on:
       MOZ_BUILD_DATE:
         type: string
         default: ""
-      #? If you want to ALWAYS build with buildjet, do default to true
-      buildjet:
-        type: boolean
-        default: false
-      #? buildjet cache also is, but idk how to use on sccache
       release-note-url:
         type: string
         required: false
@@ -72,7 +66,7 @@ on:
 
 jobs:
   win-build:
-    runs-on: ${{fromJson('["ubuntu-latest","buildjet-16vcpu-ubuntu-2204"]')[inputs.buildjet]}}
+    runs-on: ubuntu-latest
     outputs:
       mar_name: ${{steps.gen-mar.outputs.MAR_NAME}}
       mar_size: ${{steps.gen-mar.outputs.MAR_SIZE}}
@@ -124,13 +118,6 @@ jobs:
       with:
         submodules: 'recursive'
 
-    #! ON UBUNTU RUNNER
-    - name: Setup Disk & Swap Space 💿
-      if: ${{!inputs.buildjet}}
-      run: |
-        chmod +x .github/workflows/src/disk_swap_for_github_runner.sh
-        .github/workflows/src/disk_swap_for_github_runner.sh
-
     - name: Configure sccache
       uses: actions/github-script@v6
       with: