Merge branch 'QA_5_2'

williamdes · williamdes · commit 41c84321fc22 · 2023-08-09T15:05:04.000+02:00
Signed-off-by: William Desportes &lt;williamdes@wdes.fr&gt;
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
@@ -451,8 +451,12 @@ if [ $do_ci -eq 0 -a -$do_daily -eq 0 ] ; then
     fi
 fi
 
-# Cleanup release dir
-LC_ALL=C date -u > RELEASE-DATE-$version
+# Save the build date
+if [ $do_daily -eq 1 ] ; then
+    LC_ALL=C date -u > RELEASE-DATE-$VERSION_SERIES_FROM_FILE+snapshot
+else
+    LC_ALL=C date -u > RELEASE-DATE-$version
+fi
 
 # Building documentation
 echo "* Running sphinx-build (version: $(sphinx-build --version))"
diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php
@@ -189,6 +189,13 @@ public function testCheckGitRevisionPacksFolder(): void
         mkdir($this->testDir . '.git/objects/pack', 0777, true);//default = 0777, recursive mode
 
         $commit = $this->object->checkGitRevision();
+        // Delete the dataset
+        rmdir($this->testDir . '.git/objects/pack');
+        rmdir($this->testDir . '.git/objects');
+        unlink($this->testDir . '.git/packed-refs');
+        unlink($this->testDir . '.git/HEAD');
+        unlink($this->testDir . '.git/config');
+        rmdir($this->testDir . '.git');
 
         if (
             $commit === null
@@ -212,13 +219,6 @@ public function testCheckGitRevisionPacksFolder(): void
         $this->assertSame('phpMyAdmin bot', $commit['committer']['name']);
         $this->assertSame('bot@phpmyadmin.net', $commit['committer']['email']);
         $this->assertSame('2023-05-14T00:19:49Z', $commit['committer']['date']);
-
-        rmdir($this->testDir . '.git/objects/pack');
-        rmdir($this->testDir . '.git/objects');
-        unlink($this->testDir . '.git/packed-refs');
-        unlink($this->testDir . '.git/HEAD');
-        unlink($this->testDir . '.git/config');
-        rmdir($this->testDir . '.git');
     }
 
     /**
@@ -296,6 +296,14 @@ public function testCheckGitRevisionPacksFile(): void
         );
 
         $commit = $this->object->checkGitRevision();
+        // Delete the dataset
+        unlink($this->testDir . '.git/objects/info/packs');
+        rmdir($this->testDir . '.git/objects/info');
+        rmdir($this->testDir . '.git/objects');
+        unlink($this->testDir . '.git/packed-refs');
+        unlink($this->testDir . '.git/HEAD');
+        unlink($this->testDir . '.git/config');
+        rmdir($this->testDir . '.git');
 
         if (
             $commit === null
@@ -319,14 +327,6 @@ public function testCheckGitRevisionPacksFile(): void
         $this->assertSame('phpMyAdmin bot', $commit['committer']['name']);
         $this->assertSame('bot@phpmyadmin.net', $commit['committer']['email']);
         $this->assertSame('2023-05-14T00:19:49Z', $commit['committer']['date']);
-
-        unlink($this->testDir . '.git/objects/info/packs');
-        rmdir($this->testDir . '.git/objects/info');
-        rmdir($this->testDir . '.git/objects');
-        unlink($this->testDir . '.git/packed-refs');
-        unlink($this->testDir . '.git/HEAD');
-        unlink($this->testDir . '.git/config');
-        rmdir($this->testDir . '.git');
     }
 
     /**
