[FB] Workflow | Fix mozconfig

Floorp-Projects · Jul 1, 2023 · d701c85 · d701c85
1 parent b14c1a3
commit d701c85
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/.github/workflows/deployments.yml b/.github/workflows/deployments.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
-        runs-on: ["buildjet-16vcpu-ubuntu-2204"]
+        runs-on: ["ubuntu-latest"]
 
     steps:
     - name: Init
@@ -201,7 +201,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
-        runs-on: ["buildjet-16vcpu-ubuntu-2204"]
+        runs-on: ["ubuntu-latest"]
 
     steps:
     - name: Init
@@ -408,7 +408,7 @@ jobs:
          echo 'ac_add_options --with-branding=browser/branding/official' >> mozconfig
          echo 'ac_add_options --disable-crashreporter' >> mozconfig
          echo 'ac_add_options --enable-proxy-bypass-protection' >> mozconfig
-         echo 'ac_add_options --enable-unverified-updates' >> mozconfig
+         echo 'ac_add_options --disable-verify-mar' >> mozconfig
          echo 'ac_add_options --enable-update-channel=release' >> mozconfig
          echo 'ac_add_options --with-mozilla-api-keyfile=$PWD/floorp/apis/api-mozilla-key' >> mozconfig
          echo 'ac_add_options --with-google-location-service-api-keyfile=$PWD/floorp/apis/api-google-location-service-key' >> mozconfig
@@ -418,7 +418,7 @@ jobs:
          echo 'ac_add_options --enable-optimize="-O3"' >> mozconfig
          echo 'ac_add_options --enable-lto' >> mozconfig
          echo 'ac_add_options MOZ_PGO=1' >> mozconfig
-         echo 'export RUSTC_OPT_LEVEL=2 '>> mozconfig
+         echo 'export RUSTC_OPT_LEVEL=3 '>> mozconfig
          echo 'export MOZ_INCLUDE_SOURCE_INFO=1' >> mozconfig
          echo 'MOZ_REQUIRE_SIGNING=' >> mozconfig
          echo 'MOZ_DATA_REPORTING=' >> mozconfig
@@ -517,7 +517,6 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
-          rustup target add aarch64-unknown-linux-gnu
 
       - name: Change Rust version
         run: |
@@ -530,12 +529,13 @@ jobs:
           sudo apt install xvfb
           git clone https://github.com/floorp-projects/l10n-central.git
           ./mach --no-interactive bootstrap --application-choice browser
+
           echo 'ac_add_options --with-app-name=floorp' >> mozconfig
           echo 'ac_add_options --with-app-basename=Floorp' >> mozconfig
           echo 'ac_add_options --with-branding=browser/branding/official' >> mozconfig
           echo 'ac_add_options --disable-crashreporter' >> mozconfig
           echo 'ac_add_options --enable-proxy-bypass-protection' >> mozconfig
-          echo 'ac_add_options --enable-unverified-updates' >> mozconfig
+          echo 'ac_add_options --disable-verify-mar' >> mozconfig
           echo 'ac_add_options --enable-update-channel=release' >> mozconfig
           echo 'ac_add_options --with-mozilla-api-keyfile=$PWD/floorp/apis/api-mozilla-key' >> mozconfig
           echo 'ac_add_options --with-google-location-service-api-keyfile=$PWD/floorp/apis/api-google-location-service-key' >> mozconfig
@@ -552,6 +552,16 @@ jobs:
           echo 'MOZ_REQUIRE_SIGNING=' >> mozconfig
           echo 'MOZ_DATA_REPORTING=' >> mozconfig
           echo 'MOZ_TELEMETRY_REPORTING=' >> mozconfig
+    
+      - name: Change Rust version & Cross compile 🦀
+        run: |
+         rustup install 1.69.0
+         rustup default 1.69.0
+         rustup target add aarch64-unknown-linux-gnu
+         rustc --version
+
+      - name: Configure 🛠
+        run: |
           ./mach configure
 
       - name: Build 🔨