You can build & deploy new releases with GitHub Actions as described in the following sections.
-
Select the workflow Container Build and Push 🐳
⏏️ on the left side: -
Click on Run workflow and a dropdown will open where you can choose a branch.
-
Choose corresponding branch of the environment you want to deploy a new version to:
→ If you want to deploy to the test environment, choosetest
(will mergemain
intotest
).
→ If you want to deploy to the production environment, chooseproduction
(will mergetest
intoproduction
).
-
Create a hotfix branch named
hotfix/1234-short-description
from theproduction
branch (with1234
being the issue number andshort-description
being a summary of the purpose of the branch). -
Test hotfix on your environment.
-
Commit your fixes to the hotfix branch, then push the hotfix branch.
-
Select the workflow HotFix Build and Push 🔥🚒 on the left side:
-
Click on Run workflow and a dropdown will open where you can choose a branch.
-
When finished, the package repository should look similar to the following screenshot:
-
Now your hotfix will be deploy automatic to test and production.
-
To complete the process, you have to merge back the hotfix changes to
production
,test
andmain
, or otherwise they would be missing in the next (regular or hotfix) release.-
Merge the hotfix branch into
production
:git checkout production git merge hotfix/1234-short-description git push
-
Merge the hotfix branch into
test
:git checkout test git merge hotfix/1234-short-description git push
-
Merge the hotfix branch into
main
:git checkout main git merge hotfix/1234-short-description # Resolve possible merge conflicts & `git commit` them... git push
-
-
Finally, you can delete the hotfix branch.