Merge branch 'test' into dev

acdh-oeaw · Oct 30, 2024 · 0cdf27e · 0cdf27e
2 parents cf406f3 + 92cbba3
commit 0cdf27e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,8 +46,6 @@ upgrade
 
 # Files which should be generated on deployment
 webroot/js/idp_select/DiscoFeed\.json
-webroot/search_list.json
-webroot/sitemap.xml
 
 # DB schema dump
 /config/Migrations/schema-dump-default.lock
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -13,6 +13,19 @@
 - Required PHP version 8.3 or later, since version 8.2 active support ends on 2024-12-31
 
 
+## Version 2024-09/3
+*Release date: 2024-10-30*
+
+### Bug fix
+- Fix: Required file missing - sitemap.xml #110
+
+## Version 2024-09/2
+*Release date: 2024-10-22*
+
+### Bug fix
+- Fix: Required file missing - search_list.json #110 
+
+
 ## Version 2024-09 
 *Release date: 2024-10-05*
 

diff --git a/cronjob-output/.gitignore b/cronjob-output/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/src/Command/GenSearchListCommand.php b/src/Command/GenSearchListCommand.php
@@ -36,7 +36,7 @@ public function execute(Arguments $args, ConsoleIo $io)
                 . '  -  ' . trim($course->course_type->name);
         }
 
-        $file = fopen('webroot/search_list.json', 'w');
+        $file = fopen('cronjob-output/search_list.json', 'w');
         fwrite($file, json_encode($searchList));
         fclose($file);
 

diff --git a/src/Command/GenSitemapCommand.php b/src/Command/GenSitemapCommand.php
@@ -29,7 +29,7 @@ public function execute(Arguments $args, ConsoleIo $io)
         );
 
         // add header
-        $file = fopen('webroot/sitemap.xml', 'w');
+        $file = fopen('cronjob-output/sitemap.xml', 'w');
         fwrite($file, "<?xml version='1.0' encoding='UTF-8'?>\n\n");
         fwrite($file, '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n");
 

diff --git a/webroot/search_list.json b/webroot/search_list.json
@@ -0,0 +1 @@
+../cronjob-output/search_list.json
diff --git a/webroot/sitemap.xml b/webroot/sitemap.xml
@@ -0,0 +1 @@
+../cronjob-output/sitemap.xml