@panoptic-it-solutions/coolify-setup 1.1.34 → 1.1.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js
CHANGED
|
@@ -232,8 +232,9 @@ async function main() {
|
|
|
232
232
|
console.log(' staging → Staging deployment (auto-deploy on merge)');
|
|
233
233
|
console.log(' main → Production deployment (merge PR to deploy)\n');
|
|
234
234
|
console.log(chalk.bold('Deployment Flow:\n'));
|
|
235
|
-
console.log('
|
|
236
|
-
console.log('
|
|
235
|
+
console.log(' feature/** → PR to develop → merge');
|
|
236
|
+
console.log(' develop → PR to staging → merge → staging deploys');
|
|
237
|
+
console.log(' staging → PR to main → merge → prod deploys\n');
|
|
237
238
|
}
|
|
238
239
|
main().catch((error) => {
|
|
239
240
|
console.error(chalk.red('Error:'), error);
|
|
@@ -27,19 +27,23 @@ This project uses a trunk-based development workflow with deployment branches:
|
|
|
27
27
|
- Fixes: \`fix/bug-description\`
|
|
28
28
|
- Hotfixes: \`hotfix/urgent-fix\`
|
|
29
29
|
|
|
30
|
-
2. **
|
|
30
|
+
2. **Feature Development**: Push feature/fix/hotfix branches
|
|
31
31
|
- Builds Docker image
|
|
32
32
|
- Pushes to private registry
|
|
33
|
+
- Creates PR to \`develop\` branch
|
|
34
|
+
|
|
35
|
+
3. **Integration**: Merge PR to \`develop\`
|
|
36
|
+
- Builds Docker image
|
|
33
37
|
- Creates PR to \`staging\` branch
|
|
34
38
|
|
|
35
|
-
|
|
39
|
+
4. **Staging Deployment**: Merge PR to \`staging\`
|
|
36
40
|
- Coolify auto-deploys to staging server
|
|
37
41
|
- GitHub Actions runs semantic versioning workflow
|
|
38
42
|
- Creates \`staging-v*\` tags based on conventional commits
|
|
43
|
+
- Creates PR to \`main\` branch
|
|
39
44
|
- Test changes in staging environment
|
|
40
45
|
|
|
41
|
-
|
|
42
|
-
- Review changes and merge
|
|
46
|
+
5. **Production Deployment**: Merge PR to \`main\`
|
|
43
47
|
- Coolify auto-deploys to production server
|
|
44
48
|
|
|
45
49
|
### Conventional Commits
|
|
@@ -46,11 +46,21 @@ jobs:
|
|
|
46
46
|
- name: Determine target branch
|
|
47
47
|
id: target
|
|
48
48
|
run: |
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
SOURCE_BRANCH="\${{ github.ref_name }}"
|
|
50
|
+
|
|
51
|
+
# Feature/fix/hotfix branches target develop
|
|
52
|
+
if [[ "\\$SOURCE_BRANCH" == feature/* ]] || [[ "\\$SOURCE_BRANCH" == fix/* ]] || [[ "\\$SOURCE_BRANCH" == hotfix/* ]]; then
|
|
53
|
+
echo "branch=develop" >> \\$GITHUB_OUTPUT
|
|
54
|
+
# Develop targets staging
|
|
55
|
+
elif [[ "\\$SOURCE_BRANCH" == "develop" ]]; then
|
|
56
|
+
echo "branch=staging" >> \\$GITHUB_OUTPUT
|
|
57
|
+
# Staging/other branches don't create PRs (staging->main handled separately)
|
|
58
|
+
else
|
|
59
|
+
echo "branch=" >> \\$GITHUB_OUTPUT
|
|
60
|
+
fi
|
|
52
61
|
|
|
53
62
|
- name: Create deploy PR
|
|
63
|
+
if: steps.target.outputs.branch != ''
|
|
54
64
|
uses: actions/github-script@v7
|
|
55
65
|
with:
|
|
56
66
|
script: |
|