MokoConsulting/MokoCassiopeia
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Releases 1 Activity

Revert to merge strategy and separate SFTP folders per channel

Browse Source 
Co-authored-by: jmiller-moko <230051081+jmiller-moko@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-05 08:31:22 +00:00
parent 7b02756587
commit 6c04a90261
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/release_pipeline.yml vendored
View File

@@ -755,9 +755,9 @@ else:
SUFFIX="${FTP_PATH_SUFFIX:-}" SUFFIX="${FTP_PATH_SUFFIX:-}"
if [ -n "${SUFFIX}" ]; then if [ -n "${SUFFIX}" ]; then
REMOTE_PATH="${FTP_PATH%/}/${SUFFIX%/}" REMOTE_PATH="${FTP_PATH%/}/${SUFFIX%/}/${CHANNEL}"
else else
REMOTE_PATH="${FTP_PATH%/}" REMOTE_PATH="${FTP_PATH%/}/${CHANNEL}"
fi fi
AUTH_MODE="password" AUTH_MODE="password"
@@ -1007,7 +1007,7 @@ else:
--body "Automated PR created by release pipeline. Version branch is retained by policy." \ --body "Automated PR created by release pipeline. Version branch is retained by policy." \
|| true || true
- name: Attempt to merge PR (best effort, squash merge) - name: Attempt to merge PR (best effort)
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
run: | run: |
@@ -1021,7 +1021,7 @@ else:
exit 1 exit 1
fi fi
gh pr merge "${PR_NUMBER}" --squash --delete-branch=false \ gh pr merge "${PR_NUMBER}" --merge --delete-branch=false \
|| echo "PR merge blocked by branch protection or policy" >> "${GITHUB_STEP_SUMMARY}" || echo "PR merge blocked by branch protection or policy" >> "${GITHUB_STEP_SUMMARY}"
- name: Report run context (always) - name: Report run context (always)