diff --git a/SECURITY.md b/SECURITY.md index ef71d7c..48573c4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -46,7 +46,7 @@ The vulnerability will be publicly announced after the release. Finally, your na to the [hall of fame](https://hackerone.com/nextcloud/thanks) as a thank you from the entire Nextcloud community. -If the vulnerability involves an app that is not maintained by Nextcloud (i.e. hosted by the +If the vulnerability involves an app that is not maintained by Nextcloud (i.e. hosted by the Nextcloud project but community maintained, or hosted elsewhere), the security team will try to coordinate with the current maintainer and help to get the issue fixed in similar fashion. diff --git a/workflow-templates/command-compile.yml b/workflow-templates/command-compile.yml index c35a43c..e5456dd 100644 --- a/workflow-templates/command-compile.yml +++ b/workflow-templates/command-compile.yml @@ -136,26 +136,26 @@ jobs: if: ${{ contains(needs.init.outputs.arg1, 'rebase') }} run: | git fetch origin '${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}' - + # Start the rebase git rebase 'origin/${{ needs.init.outputs.base_ref }}' || { # Handle rebase conflicts in a loop while [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; do echo "Handling rebase conflict..." - + # Remove and checkout /dist and /js folders from the base branch if [ -d "dist" ]; then rm -rf dist git checkout origin/${{ needs.init.outputs.base_ref }} -- dist/ 2>/dev/null || echo "No dist folder in base branch" fi if [ -d "js" ]; then - rm -rf js + rm -rf js git checkout origin/${{ needs.init.outputs.base_ref }} -- js/ 2>/dev/null || echo "No js folder in base branch" fi - + # Stage all changes git add . - + # Check if there are any changes after resolving conflicts if git diff --cached --quiet; then echo "No changes after conflict resolution, skipping commit" @@ -164,7 +164,7 @@ jobs: echo "Changes found, continuing rebase without editing commit message" git -c core.editor=true rebase --continue fi - + # Break if rebase is complete if [ ! -d .git/rebase-merge ] && [ ! -d .git/rebase-apply ]; then break