From e2f122ff7dcee60b5facd53b527d4857677c72e1 Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Thu, 18 Jan 2024 22:22:19 +0100
Subject: [PATCH 1/2] Test that fails prior to bugfix

---
 .../toolchain/missing-tool-redeploy/test.py   | 24 +++++++++++++++++++
 .../toolchain/missing-tool-redeploy/test.yaml |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 testsuite/tests/toolchain/missing-tool-redeploy/test.py
 create mode 100644 testsuite/tests/toolchain/missing-tool-redeploy/test.yaml

diff --git a/testsuite/tests/toolchain/missing-tool-redeploy/test.py b/testsuite/tests/toolchain/missing-tool-redeploy/test.py
new file mode 100644
index 000000000..937a023c4
--- /dev/null
+++ b/testsuite/tests/toolchain/missing-tool-redeploy/test.py
@@ -0,0 +1,24 @@
+"""
+Verify that redeploying a missing tool works as intended.
+As we cache the detected toolchains, if we fail to reload them on changes, we
+could end trying to use a toolchain that is no longer available.
+"""
+
+import os
+from shutil import rmtree
+from drivers.alr import init_local_crate, run_alr
+
+# We can trigger a buggy situation by configuring a toolchain, removing
+# manually one tool (as if we had moved the cache), and running `alr printenv`.
+
+run_alr("toolchain", "--select", "gprbuild", "gnat_native")
+init_local_crate()
+
+# Remove the tool manually through the filesystem
+rmtree(os.path.join(os.environ["ALR_CONFIG"], "cache"))
+
+# This should not fail
+run_alr("printenv")
+
+
+print("SUCCESS")
diff --git a/testsuite/tests/toolchain/missing-tool-redeploy/test.yaml b/testsuite/tests/toolchain/missing-tool-redeploy/test.yaml
new file mode 100644
index 000000000..7d0e9fc67
--- /dev/null
+++ b/testsuite/tests/toolchain/missing-tool-redeploy/test.yaml
@@ -0,0 +1,4 @@
+driver: python-script
+build_mode: both
+indexes:
+    gnat_toolchain_index: {}
\ No newline at end of file

From 9f06b3ca013cfc23b19361476cff285da3f3a8cd Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Thu, 18 Jan 2024 23:51:10 +0100
Subject: [PATCH 2/2] Fix for cache invalidation

An unrelated bug is fixed that happened when not using an actual binary crate
for a compiler in the testsuite.
---
 .github/workflows/ci-windows.yml              |  10 ++---
 src/alire/alire-builds-hashes.adb             |  12 ++++++
 src/alire/alire-directories.adb               |   6 ++-
 src/alire/alire-directories.ads               |   4 +-
 src/alire/alire-toolchains-solutions.adb      |   1 -
 src/alire/alire-toolchains.adb                |  35 +++++++++++-------
 src/alire/alire-toolchains.ads                |   2 +-
 .../fixtures/crates/gnat_native_mock_1.0.zip  | Bin 0 -> 5158 bytes
 .../fixtures/crates/gprbuild_mock_1.0.zip     | Bin 0 -> 4991 bytes
 .../gn/gnat_native/gnat_native-1.0.0.toml     |   6 ++-
 .../gp/gprbuild/gprbuild-1.0.0.toml           |   6 ++-
 .../toolchain/missing-tool-redeploy/test.py   |   9 +++--
 12 files changed, 60 insertions(+), 31 deletions(-)
 create mode 100644 testsuite/fixtures/crates/gnat_native_mock_1.0.zip
 create mode 100644 testsuite/fixtures/crates/gprbuild_mock_1.0.zip

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 348c59801..e6adc0598 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -39,7 +39,7 @@ jobs:
       run: ./bin/alr --non-interactive help get
 
     - name: install tar from msys2 (Git tar in Actions VM does not seem to work)
-      run: C:\Users\runneradmin\.cache\alire\msys64\usr\bin\pacman --noconfirm -S tar
+      run: C:\Users\runneradmin\AppData\Local\alire\msys64\usr\bin\pacman --noconfirm -S tar
 
     - name: Install Python 3.x (required for the testsuite)
       uses: actions/setup-python@v2
@@ -57,17 +57,17 @@ jobs:
       run: gprinstall -p -P alr_env --prefix=${{ runner.temp }}/alr_install
 
     - name: Install qt-installer-framework in msys2
-      run: C:\Users\runneradmin\.cache\alire\msys64\usr\bin\pacman --noconfirm -S mingw64/mingw-w64-x86_64-qt-installer-framework
+      run: C:\Users\runneradmin\AppData\Local\alire\msys64\usr\bin\pacman --noconfirm -S mingw64/mingw-w64-x86_64-qt-installer-framework
 
     - name: Add msys2 /mingw64/bin to the path (for qt-installer-framework)
-      run: echo 'C:\Users\runneradmin\.cache\alire\msys64\mingw64\bin' >> $GITHUB_PATH
+      run: echo 'C:\Users\runneradmin\AppData\Local\alire\msys64\mingw64\bin' >> $GITHUB_PATH
       shell: bash
 
     - name: Install zip in msys2
-      run: C:\Users\runneradmin\.cache\alire\msys64\usr\bin\pacman --noconfirm -S zip
+      run: C:\Users\runneradmin\AppData\Local\alire\msys64\usr\bin\pacman --noconfirm -S zip
 
     - name: Add msys2 /usr/bin to the path (for zip)
-      run: echo 'C:\Users\runneradmin\.cache\alire\msys64\usr\bin' >> $GITHUB_PATH
+      run: echo 'C:\Users\runneradmin\AppData\Local\alire\msys64\usr\bin' >> $GITHUB_PATH
       shell: bash
 
     - name: Run installer build script
diff --git a/src/alire/alire-builds-hashes.adb b/src/alire/alire-builds-hashes.adb
index 012f0f588..793a92b3f 100644
--- a/src/alire/alire-builds-hashes.adb
+++ b/src/alire/alire-builds-hashes.adb
@@ -102,6 +102,12 @@ package body Alire.Builds.Hashes is
             Add ("profile",
                  Rel.Name.As_String,
                  Root.Configuration.Build_Profile (Rel.Name)'Image);
+         exception
+            when others =>
+               Trace.Error
+                 ("While hashing: missing build profile for "
+                  & Rel.Milestone.TTY_Image);
+               raise;
          end Add_Profile;
 
          ------------------
@@ -123,6 +129,12 @@ package body Alire.Builds.Hashes is
             Add ("switches",
                  Rel.Name.As_String,
                  Switches.To_Vector.Flatten (","));
+         exception
+            when others =>
+               Trace.Error
+                 ("While hashing: missing switches for "
+                  & Rel.Milestone.TTY_Image);
+               raise;
          end Add_Switches;
 
          -------------------
diff --git a/src/alire/alire-directories.adb b/src/alire/alire-directories.adb
index ba9182772..a73641521 100644
--- a/src/alire/alire-directories.adb
+++ b/src/alire/alire-directories.adb
@@ -1153,10 +1153,14 @@ package body Alire.Directories is
    -- Touch --
    -----------
 
-   procedure Touch (File : File_Path) is
+   procedure Touch (File : File_Path; Create_Tree : Boolean := False) is
       use GNAT.OS_Lib;
       Success : Boolean := False;
    begin
+      if Create_Tree then
+         Directories.Create_Tree (Parent (File));
+      end if;
+
       if Is_Regular_File (File) then
          Set_File_Last_Modify_Time_Stamp (File, Current_Time);
       elsif Ada.Directories.Exists (File) then
diff --git a/src/alire/alire-directories.ads b/src/alire/alire-directories.ads
index 452d42d73..64af2cd39 100644
--- a/src/alire/alire-directories.ads
+++ b/src/alire/alire-directories.ads
@@ -98,8 +98,8 @@ package Alire.Directories is
    --  the top-level only contains "doinstall", "README" and so on that
    --  are unusable and would be confusing in a binary prefix.
 
-   procedure Touch (File : File_Path)
-     with Pre => Is_Directory (Parent (File));
+   procedure Touch (File : File_Path; Create_Tree : Boolean := False)
+     with Pre => Create_Tree or else Is_Directory (Parent (File));
    --  If the file exists, update last edition time; otherwise create it.
    --  If File denotes anything else than a regular file, raise.
 
diff --git a/src/alire/alire-toolchains-solutions.adb b/src/alire/alire-toolchains-solutions.adb
index 288cf8ebc..af1e46a41 100644
--- a/src/alire/alire-toolchains-solutions.adb
+++ b/src/alire/alire-toolchains-solutions.adb
@@ -29,7 +29,6 @@ package body Alire.Toolchains.Solutions is
 
          --  It must be redeployed
          Put_Warning ("Tool " & Mil.TTY_Image & " is missing, redeploying...");
-
          Toolchains.Deploy (Index.Find (Mil.Crate, Mil.Version));
       end Redeploy_If_Needed;
 
diff --git a/src/alire/alire-toolchains.adb b/src/alire/alire-toolchains.adb
index 0c6388a1c..8e1e1f26e 100644
--- a/src/alire/alire-toolchains.adb
+++ b/src/alire/alire-toolchains.adb
@@ -26,15 +26,19 @@ package body Alire.Toolchains is
 
    use Directories.Operators;
 
-   procedure Invalidate_Available_Cache;
-
    --------------
    -- Any_Tool --
    --------------
    --  crate=* dependency builder
    function Any_Tool (Crate : Crate_Name) return Dependencies.Dependency
    is (Dependencies.New_Dependency
-        (Crate, Semantic_Versioning.Extended.Any));
+       (Crate, Semantic_Versioning.Extended.Any));
+
+   ----------------------
+   -- Dirty_Cache_Flag --
+   ----------------------
+
+   function Dirty_Cache_Flag return Absolute_Path is (Path / "must_reload");
 
    ---------------
    -- Assistant --
@@ -382,8 +386,6 @@ package body Alire.Toolchains is
          Install (Release);
       end loop;
 
-      Invalidate_Available_Cache;
-
    end Assistant;
 
    ----------------------
@@ -412,8 +414,6 @@ package body Alire.Toolchains is
         (Level,
          Key   => Tool_Key (Release.Name, For_Is_External),
          Value => not Release.Origin.Is_Index_Provided);
-
-      Invalidate_Available_Cache;
    end Set_As_Default;
 
    -----------------------------
@@ -487,11 +487,9 @@ package body Alire.Toolchains is
             end if;
          end;
       end if;
-
-      Invalidate_Available_Cache;
    end Unconfigure;
 
-   Available_Cached : Releases.Containers.Release_Set;
+   Available_Cached    : Releases.Containers.Release_Set;
 
    --------------------------------
    -- Invalidate_Available_Cache --
@@ -545,9 +543,12 @@ package body Alire.Toolchains is
 
    begin
       --  Early exit with cached available toolchains. Looking for toolchains
-      --  on disk is expensive. We invalidate the cache on toolchain changes.
+      --  on disk is expensive. We rely on folder modification time to
+      --  re-detect available toolchains.
 
-      if not Available_Cached.Is_Empty then
+      if not Available_Cached.Is_Empty and then
+        not Ada.Directories.Exists (Dirty_Cache_Flag)
+      then
          return Available_Cached;
       end if;
 
@@ -573,7 +574,11 @@ package body Alire.Toolchains is
          end loop;
       end loop;
 
+      --  Update cache and remove dirty flag
+
       Available_Cached := Result;
+      Directories.Force_Delete (Dirty_Cache_Flag);
+
       return Result;
    end Available;
 
@@ -581,7 +586,7 @@ package body Alire.Toolchains is
    -- Path --
    ----------
 
-   function Path return String
+   function Path return Absolute_Path
    is (Config.Edit.Cache_Path / "toolchains");
 
    ------------
@@ -620,6 +625,10 @@ package body Alire.Toolchains is
             & Release.Milestone.TTY_Image);
       end if;
 
+      --  Notify that releases must be reloaded
+
+      Directories.Touch (Dirty_Cache_Flag, Create_Tree => True);
+
       Put_Info (Release.Milestone.TTY_Image & " installed successfully.");
    end Deploy;
 
diff --git a/src/alire/alire-toolchains.ads b/src/alire/alire-toolchains.ads
index d2848e071..9dd52ac85 100644
--- a/src/alire/alire-toolchains.ads
+++ b/src/alire/alire-toolchains.ads
@@ -124,7 +124,7 @@ package Alire.Toolchains is
    --  Retrieve the release corresponding to Target, if it exists. Will raise
    --  Constraint_Error if not among Available.
 
-   function Path return Any_Path;
+   function Path return Absolute_Path;
    --  Returns the base folder in which all toolchain releases live, defaults
    --  to <cache>/toolchains
 
diff --git a/testsuite/fixtures/crates/gnat_native_mock_1.0.zip b/testsuite/fixtures/crates/gnat_native_mock_1.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c9045484a778b82a7c747b6f5562ce808f46c0d8
GIT binary patch
literal 5158
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
PGdJ+V3A|(7MEUf8_}e2m

literal 0
HcmV?d00001

diff --git a/testsuite/fixtures/crates/gprbuild_mock_1.0.zip b/testsuite/fixtures/crates/gprbuild_mock_1.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..2223a28991087681b353722ccd5d6ad7d4301bd4
GIT binary patch
literal 4991
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

literal 0
HcmV?d00001

diff --git a/testsuite/fixtures/gnat_toolchain_index/gn/gnat_native/gnat_native-1.0.0.toml b/testsuite/fixtures/gnat_toolchain_index/gn/gnat_native/gnat_native-1.0.0.toml
index 1fda1870b..9bc8fba98 100644
--- a/testsuite/fixtures/gnat_toolchain_index/gn/gnat_native/gnat_native-1.0.0.toml
+++ b/testsuite/fixtures/gnat_toolchain_index/gn/gnat_native/gnat_native-1.0.0.toml
@@ -6,5 +6,7 @@ licenses = "GPL-3.0-only OR MIT"
 maintainers = ["some@bo.dy"]
 maintainers-logins = ["mylogin"]
 
-[origin]
-url = "file:."
+# Conditional origin so it's considered a binary crate
+[origin."case(os)"."..."]
+url = "file:../../../crates/gnat_native_mock_1.0.zip"
+hashes = ["sha256:db87865b59d7d733e4104b3c0f29c8bf590d5ff0b3ea2d61bded4e47beabf1a3"]
diff --git a/testsuite/fixtures/gnat_toolchain_index/gp/gprbuild/gprbuild-1.0.0.toml b/testsuite/fixtures/gnat_toolchain_index/gp/gprbuild/gprbuild-1.0.0.toml
index 5cb03b16e..eca56d3c0 100644
--- a/testsuite/fixtures/gnat_toolchain_index/gp/gprbuild/gprbuild-1.0.0.toml
+++ b/testsuite/fixtures/gnat_toolchain_index/gp/gprbuild/gprbuild-1.0.0.toml
@@ -5,5 +5,7 @@ licenses = "GPL-3.0-only OR MIT"
 maintainers = ["some@bo.dy"]
 maintainers-logins = ["mylogin"]
 
-[origin]
-url = "file:."
+# Conditional origin so it's considered a binary crate
+[origin."case(os)"."..."]
+url = "file:../../../crates/gprbuild_mock_1.0.zip"
+hashes = ["sha256:e3d52b4a441a56ab1c0175ee8ea407864b72879cf73184a9f7d68eef53a87451"]
diff --git a/testsuite/tests/toolchain/missing-tool-redeploy/test.py b/testsuite/tests/toolchain/missing-tool-redeploy/test.py
index 937a023c4..4e368e7e9 100644
--- a/testsuite/tests/toolchain/missing-tool-redeploy/test.py
+++ b/testsuite/tests/toolchain/missing-tool-redeploy/test.py
@@ -7,9 +7,10 @@
 import os
 from shutil import rmtree
 from drivers.alr import init_local_crate, run_alr
+from drivers.asserts import assert_match
 
 # We can trigger a buggy situation by configuring a toolchain, removing
-# manually one tool (as if we had moved the cache), and running `alr printenv`.
+# manually the tool (as if we had moved the cache), and running `alr printenv`.
 
 run_alr("toolchain", "--select", "gprbuild", "gnat_native")
 init_local_crate()
@@ -17,8 +18,8 @@
 # Remove the tool manually through the filesystem
 rmtree(os.path.join(os.environ["ALR_CONFIG"], "cache"))
 
-# This should not fail
-run_alr("printenv")
-
+# This should not fail. A message should warn of redeployments happening.
+p = run_alr("printenv", quiet=False)
+assert_match(".*Tool .* is missing, redeploying", p.out)
 
 print("SUCCESS")