From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 16 Mar 2022 08:43:54 +0000 (+0100)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~66
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fbba183019e0fbce7aabee78b9bf4c9177cef92;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

2fbba183019e0fbce7aabee78b9bf4c9177cef92
diff --cc .github/workflows/typescript.yml
index c8fa50407a,6b48241cc1..50d5879d41
--- a/.github/workflows/typescript.yml
+++ b/.github/workflows/typescript.yml
@@@ -50,8 -47,9 +50,9 @@@ jobs
        uses: actions/setup-node@v2
        with:
          node-version: "16"
 -    - uses: actions/checkout@v3
 +        cache: "npm"
      - run: npm install
+     - run: rm -r wcfsetup/install/files/js/WoltLabSuite/
      - run: npx tsc
      - run: echo "::add-matcher::.github/diff.json"
      - name: Show diff
diff --cc com.woltlab.wcf/package.xml
index ea78fba0a7,3623f044c6..f878fd8f92
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@@ -5,8 -5,8 +5,8 @@@
  		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
  		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
  		<isapplication>1</isapplication>
 -		<version>5.4.15 dev 2</version>
 +		<version>5.5.0 Alpha 1</version>
- 		<date>2022-02-15</date>
+ 		<date>2022-03-15</date>
  	</packageinformation>
  	
  	<authorinformation>
@@@ -50,63 -50,21 +50,71 @@@
  		<instruction type="script">acp/post_install.php</instruction>
  	</instructions>
  
 -	<instructions type="update" fromversion="5.4.14">
 -		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 -		<instruction type="file">files_update.tar</instruction>
 -		<instruction type="template">templates_update.tar</instruction>
 -		
 -		<instruction type="language"/>
 -		
 -		<instruction type="script">acp/update_com.woltlab.wcf_5.4.15_deleteDsStore.php</instruction>
 +	<instructions type="update" fromversion="5.4.*">
 +		<!--
 +tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 +	acp/update_com.woltlab.wcf_5.5_ensureInnoDbSearch.php \
 +	acp/update_com.woltlab.wcf_5.5_normalizeFileLog.php \
 +	acp/update_com.woltlab.wcf_5.5_styleVariables.php
 +		-->
 +		<instruction type="file" run="standalone">files_pre_check.tar</instruction>
 +
 +		<!-- Checks that need to happen before the upgrade starts. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_ensureInnoDbSearch.php</instruction>
 +
 +		<!-- Clean up the file log. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_normalizeFileLog.php</instruction>
 +
 +		<!-- Insert the new style variables early to prevent style rebuilds bricking the system. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_styleVariables.php</instruction>
 +
 +		<!-- Deploy new application code. -->
 +		<instruction type="file" />
 +		<instruction type="acpTemplate" />
 +		<instruction type="template" />
 +
 +		<!-- Make all the new options available as early as possible. -->
 +		<instruction type="option" run="standalone" />
 +
 +		<!-- The updated object types are required for the boxCondition migrator. -->
 +		<instruction type="objectTypeDefinition" />
 +		<instruction type="objectType" />
 +
 +		<!-- Migrate the database as early as possible. -->
 +		<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_5.5.php</instruction>
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_boxConditions.php</instruction>
 +
 +		<!-- Install new PIPs (fileDelete, templateDelete, acpTemplateDelete). -->
 +		<instruction type="packageInstallationPlugin" />
 +
 +		<!-- Misc. PIPs. -->
 +		<instruction type="eventListener" />
 +		<instruction type="language" />
 +		<instruction type="mediaProvider" />
 +		<instruction type="userGroupOption" />
 +
 +		<!-- Updates to <allowSpidersToIndex> only -->
 +		<instruction type="page" />
 +
 +		<!-- Clean Up. -->
 +		<instruction type="acpTemplateDelete" />
 +		<instruction type="fileDelete" />
 +		<instruction type="templateDelete" />
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_clearPackageDeprecations.php</instruction>
 +
 +		<!-- Misc. Update Scripts. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_randomize_cronjobs.php</instruction>
 +
 +		<!-- Migrate the STARTTLS option last. This requires external connections and thus is the
 +			step that most likely might fail. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.5_starttls.php</instruction>
  	</instructions>
+ 
+ 	<instructions type="update" fromversion="5.4.15 dev 1">
+ 		<instruction type="file">files_update.tar</instruction>
+ 		
+ 		<instruction type="language"/>
+ 
+ 		<instruction type="script">acp/update_com.woltlab.wcf_5.4.15_deleteDsStore.php</instruction>
+ 	</instructions>
  </package>