Skip to content

Commit

Permalink
Minor fixes found during 2.0.0-alpha1 build
Browse files Browse the repository at this point in the history
  • Loading branch information
scottcwilson committed Jan 27, 2024
1 parent 638a369 commit f0d61e2
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 6 deletions.
7 changes: 7 additions & 0 deletions content/dev/release_process/dependency_checks.md
Expand Up @@ -72,3 +72,10 @@ Note that the license for mmenu changed in their v5.6.0 to CC-BY-NC-4.0, which i
- `admin/includes/stylesheet.css`

> CAUTION: Be mindful that upgrading FontAwesome between its "major" releases is usually a very cumbersome task because icon naming strategies may be different, which affects every page where FA icons are used (ie: numerous Admin pages, and Catalog templates). But upgrading minor updates is mostly a drop-in-replacement of some CSS files.

<div style="text-align:right;" id="next">
<a class="btn btn-lg btn-primary mr-3 mb-4" href="/dev/release_process/prerequisites/">
Next - Prerequisites<i class="fas fa-arrow-alt-circle-right ml-2"></i>
</a>
</div>
2 changes: 1 addition & 1 deletion content/dev/release_process/post_release.md
Expand Up @@ -44,7 +44,7 @@ insert into vb_dl2_zcversions (versiontext) values ('v1.5.8')

## Other Post-Release Tasks

The first item applies to all releases; subsequent items are for major releases only.
The first item applies to all releases (other than pre-releases); subsequent items are for major releases only.

- Update the [Release History](/user/about_us/release_history/) page with the new version and date.

Expand Down
14 changes: 10 additions & 4 deletions content/dev/release_process/pre_release_notes.md
Expand Up @@ -9,16 +9,16 @@ These notes only apply to pre-release version updates, which are done at the tim

## Git Work

TBD. In the past we have created a new branch; perhaps we will adopt a branch-on-release strategy and stay on master.
The master branch is now the current release. If a patch is being done from a release in the past, create a branch for that patch.

## Versioning files

Here's what should be in these files for version 2.0.0-alpha:
Here's what should be in these files for version 2.0.0-alpha1:

|File | Version
------|--------
|`includes/version.php`| `define('PROJECT_VERSION_MINOR', '0.0-alpha');`|
|`zc_install/includes/version.php`|`define('PROJECT_VERSION_MINOR', '0.0-alpha');`|
|`includes/version.php`| `define('PROJECT_VERSION_MINOR', '0.0-alpha1');`|
|`zc_install/includes/version.php`|`define('PROJECT_VERSION_MINOR', '0.0-alpha1');`|
|`zc_install/sql/install/mysql_zencart.sql`|`project_version_patch1` for the two `Zen-Cart Main` rows should be `New Installation-v200-alpha1`<br>`project_version_patch1` for the two `Zen-Cart Database` rows should be `New Installation-v200-alpha1`|
|`zc_install/sql/updates/mysql_upgrade_zencart_200.sql`|`project_version_comment` for the two version rows should be `Version Update 1.5.8->2.0.0-alpha1`|
|`zc_install/includes/systemChecks.yml`|Top `checkDBVersion` block should be `version: '2.0.0'`|
Expand All @@ -31,4 +31,10 @@ If the new version has different PHP compatibility ranges than the prior one, be

- `composer.json`
- The [Server Requirements](https://docs.zen-cart.com/user/first_steps/server_requirements/#php-version) help document
- The What's New file for the release in [Release Docs](https://docs.zen-cart.com/release)

<div style="text-align:right;" id="next">
<a class="btn btn-lg btn-primary mr-3 mb-4" href="/dev/release_process/dependency_checks/">
Next - Dependency Checks<i class="fas fa-arrow-alt-circle-right ml-2"></i>
</a>
</div>
10 changes: 10 additions & 0 deletions content/dev/release_process/release_log.md
Expand Up @@ -5,6 +5,16 @@ layout: docs
category: release_process
---

# v2.0.0-alpha1

Built 27 Jan 2024

first_hash = ca928ffa40ddb4157e607e45f05df5f4105c4569

last_hash = 9b1a1ec14be3c47896231575811bee12b17ec1a7

initial version stamping commit = https://github.com/zencart/zencart/commit/bc0c4bf48d7160bce6c944af69b1ae45b7f8c461

# v1.5.8a

Built 18 Mar 2023
Expand Down
2 changes: 1 addition & 1 deletion content/dev/release_process/version_stamping.md
Expand Up @@ -140,7 +140,7 @@ git checkout v158
## Capturing information in Release Log

There is a section of these docs called [Release Log]({{< ref "release_log" >}} "release log"), in which you should capture some
basic information about the release progress. Update `/dev/release_process/release_log/`.
basic information about the release progress. Update `/dev/release_process/release_log.md`.


<div style="text-align:right;" id="next">
Expand Down

0 comments on commit f0d61e2

Please sign in to comment.