fix: json-build.yml (#9785)

Signed-off-by: Gilver <roachy@fyralabs.com>
2026-07-02 17:00:54 +00:00 · 2026-02-10 12:08:07 -06:00
parent 0103397f49
commit 135f9a18b2
1 changed files with 0 additions and 11 deletions
@@ -35,17 +35,6 @@ on:
        type: boolean
        default: true

-<<<<<<< HEAD
-env:
-  RUSTC_WRAPPER: "/usr/bin/sccache"
-  # SCCACHE_NO_DAEMON: "1"
-  # Disable incremental compilation so sccache works better
-  CARGO_INCREMENTAL: "false"
-  SCCACHE_GHA_ENABLED: "true"
-  SCCACHE_RECACHE: "${{ inputs.bust_cache == 'true' && 'true' || '' }}"
-
-=======
->>>>>>> 05feb6592 (feat: Toggleable sccache (#9773))
 jobs:
  build:
    strategy: