Merge pull request #5899 from kit-ty-kate/disable-swh-fallback

Disable Software Heritage fallbacks by default
ocaml · Apr 2, 2024 · 4789ed2 · 4789ed2
2 parents 5a1c97b + f48d614
commit 4789ed2
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 38 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -50,6 +50,7 @@ users)
 ## Show
 
 ## Var/Option
+  * Disable Software Heritage fallbacks by default [#5899 @kit-ty-kate]
 
 ## Update / Upgrade
 

diff --git a/src/format/opamFile.ml b/src/format/opamFile.ml
@@ -1533,7 +1533,7 @@ module ConfigSyntax = struct
     depext_bypass = OpamSysPkg.Set.empty;
     sys_pkg_manager_cmd = OpamStd.String.Map.empty;
     git_location = None;
-    swh_fallback = true;
+    swh_fallback = false;
   }
 
   (* When adding a field, make sure to add it in

diff --git a/tests/reftests/init.test b/tests/reftests/init.test
@@ -116,7 +116,7 @@ download-jobs: 3
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
 wrap-remove-commands: ["%{hooks}%/sandbox.sh" "remove"] {os = "linux" | os = "macos"}
@@ -188,7 +188,7 @@ solver: "a-solver"
 solver-criteria: "solver-criteri"
 solver-fixup-criteria: "fixup-criteri"
 solver-upgrade-criteria: "upgrade-criteri"
-swh-fallback: true
+swh-fallback: false
 wrap-build-commands: ["%{hooks}%/a-script.sh" "wrap-build"]
 wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-install"]
 wrap-remove-commands: ["%{hooks}%/a-script.sh" "wrap-remove"]
@@ -242,7 +242,7 @@ opam-version: "2.0"
 post-session-commands: ["%{hooks}%/a-script.sh" "post-session"]
 pre-build-commands: ["%{hooks}%/a-script.sh" "pre-build"]
 repositories: "norepo"
-swh-fallback: true
+swh-fallback: false
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-install"]
 wrap-remove-commands: ["%{hooks}%/sandbox.sh" "remove"] {os = "linux" | os = "macos"}

diff --git a/tests/reftests/opamroot-versions.test b/tests/reftests/opamroot-versions.test
@@ -754,7 +754,7 @@ installed-switches: ["sw-comp" "sw-sys-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -833,7 +833,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -913,7 +913,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -980,7 +980,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -1046,7 +1046,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1120,7 +1120,7 @@ installed-switches: ["sw-comp" "sw-sys-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1191,7 +1191,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1265,7 +1265,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1334,7 +1334,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -1403,7 +1403,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1480,7 +1480,7 @@ installed-switches: ["sw-comp" "sw-sys-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1553,7 +1553,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "${BASEDIR}" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1629,7 +1629,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1698,7 +1698,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -1767,7 +1767,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -1836,7 +1836,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -1906,7 +1906,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -1978,7 +1978,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2039,7 +2039,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2099,7 +2099,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -2179,7 +2179,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2248,7 +2248,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2319,7 +2319,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2390,7 +2390,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2434,7 +2434,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default"]
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}
@@ -2516,7 +2516,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2576,7 +2576,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2636,7 +2636,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2697,7 +2697,7 @@ jobs: 4
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 ### opam-cat $OPAMROOT/repo/repos-config
 opam-version: "2.0"
@@ -2735,7 +2735,7 @@ installed-switches: ["sw-sys-comp" "sw-comp" "default" "${BASEDIR}/why-did-you-d
 opam-root-version: current
 opam-version: "2.0"
 repositories: "default"
-swh-fallback: true
+swh-fallback: false
 switch: "sw-sys-comp"
 wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}
 wrap-install-commands: ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}

diff --git a/tests/reftests/swhid.unix.test b/tests/reftests/swhid.unix.test
@@ -58,7 +58,7 @@ url {
   mirrors: "https://swhid.opam.ocaml.org/swh:1:dir:9f2be900491e1dabfc027848204ae01aa88fc71d"
 }
 ### opam option swh-fallback=false
-Set to 'false' the field swh-fallback in global configuration
+No modification in global configuration
 ### opam install snappy-swhid-dir -v | '"/.*curl' -> '"curl' | "${OPAMVERSION}" -> "current"
 The following actions will be performed:
 === install 1 package

diff --git a/tests/reftests/var-option.test b/tests/reftests/var-option.test
@@ -245,7 +245,7 @@ solver                         {}
 solver-criteria                {}
 solver-fixup-criteria          {}
 solver-upgrade-criteria        {}
-swh-fallback                   true
+swh-fallback                   false
 sys-pkg-manager-cmd            {}
 wrap-build-commands            {}
 wrap-install-commands          {}
@@ -629,7 +629,7 @@ solver                         {}
 solver-criteria                {}
 solver-fixup-criteria          {}
 solver-upgrade-criteria        {}
-swh-fallback                   true
+swh-fallback                   false
 sys-pkg-manager-cmd            {}
 wrap-build-commands            {}
 wrap-install-commands          {}
@@ -661,7 +661,7 @@ solver                         {}
 solver-criteria                {}
 solver-fixup-criteria          {}
 solver-upgrade-criteria        {}
-swh-fallback                   true
+swh-fallback                   false
 sys-pkg-manager-cmd            {}
 wrap-build-commands            {}
 wrap-install-commands          {}