Merge pull request #28 from dhsathiya/feature/hosts-WP-version

Feature: Different WP_VERSION for each branch

Author: mrrobot47

README.md

@@ -33,7 +33,7 @@ jobs:
 ```
 
 3. Create `SSH_PRIVATE_KEY` secret using [GitHub Action's Secret](https://developer.github.com/actions/creating-workflows/storing-secrets) and store the private key that you use use to ssh to server(s) defined in `hosts.yml`.
-4. Create `.github/hosts.yml` inventory file, based on [Deployer inventory file](https://deployer.org/docs/hosts.html#inventory-file) format. Make sure you explictly define GitHub branch mapping. Only the GitHub branches mapped in `hosts.yml` will be deployed, rest will be filtered out. Here is a sample [hosts.yml](https://github.com/rtCamp/wordpress-skeleton/blob/master/.github/hosts.yml).
+4. Create `.github/hosts.yml` inventory file, based on [Deployer inventory file](https://deployer.org/docs/hosts.html#inventory-file) format. Make sure you explictly define GitHub branch mapping. Only the GitHub branches mapped in `hosts.yml` will be deployed, rest will be filtered out. Here is a sample [hosts.yml](https://github.com/rtCamp/wordpress-skeleton/blob/main/.github/hosts.yml).
 
 
 ## Environment Variables
@@ -43,7 +43,7 @@ This GitHub action's behavior can be customized using following environment vari
 Variable          | Default | Possible  Values            | Purpose
 ------------------|---------|-----------------------------|----------------------------------------------------
 `MU_PLUGINS_URL`  | null    | vip, any git repo url       | If value is `vip`, then action will clone [VIP's MU plugins](https://github.com/Automattic/vip-mu-plugins-public) as `mu-plugins` folder. If you want to specifiy a non-VIP mu-plugins repo, you can provide a publicly accessible mu-plugins repo URL as the value.
-`WP_VERSION`      | latest  | Any valid WordPress version | If you specify a WordPress version, then that speicifc WordPress version will be downloaded, instead of latest WordPress version.
+`WP_VERSION`      | latest  | Any valid WordPress version | If you specify a WordPress version, then that speicifc WordPress version will be downloaded, instead of latest WordPress version. WP_VERSION defined in hosts.yml will have higher priority than one defined in workflow file.
 `WP_MINOR_UPDATE` | null    | `true` / `false`            | If set to `true`, latest minor version of `WP_VERSION` will be taken.
 `JUMPHOST_SERVER` | null    | Hostname/IP address of the jumphost server | If the deployment server is not directly accessible, and needs a jumphost, then this method should be used. (Note: The `SSH_PRIVATE_KEY` env variable should have access to the jumphost as well as deployment server for this to work. Also, this method does not work with vault.)
 `SUBMODULE_DEPLOY_KEY` | null | Read access deploy key created in the submodule repo's deploy keys. | Only required for privated submodule repo. For now only one private submodule deploy key is allowed. All public submodules in repo will be fetched by default without the need of this env variable. (To create a deploy key go to: Settings > Deploy Keys > Add deploy key)

main.sh

@@ -166,7 +166,15 @@ function setup_wordpress_files() {
 	cd "$HTDOCS"
 	export build_root="$(pwd)"
 
-	WP_VERSION=${WP_VERSION:-"latest"}
+	hosts_wp_version=$(cat "$hosts_file" | shyaml get-value "$GITHUB_BRANCH.WP_VERSION" 2> /dev/null)
+
+	# Check if WP_VERSION is already defined in hosts.yml
+	# Priority: 1. hosts.yml, 2. workflow file, else use latest
+	if [[ -n $hosts_wp_version ]]; then
+		WP_VERSION="$hosts_wp_version"
+	elif [[ -z $WP_VERSION ]]; then
+		WP_VERSION="latest"
+	fi
 
 	if [[ "$WP_MINOR_UPDATE" == "true" ]] && [[ "$WP_VERSION" != "latest" ]]; then
 		LATEST_MINOR_VERSION=$(\