-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge: update code from main to v3.8-js-sdk-only. (#2818)
* feat: implement merge milestone PR to target-branch. (#2796) * build: improve workflows logic. (#2801) * fix: improve time condition check mehtod. (#2804) * fix: improve time condition check mehtod. * fix * fix: webhook before online push (#2805) * fix: set own read seq in MongoDB when sender send a message. (#2808) * fix: solve err Notification when setGroupInfo. (#2806) * fix: solve err Notification when setGroupInfo. * build: update checkout version. * fix: update notification contents. * Introducing OpenIM Guru on Gurubase.io (#2788) * feat: support app update service (#2811) * fix: GroupApplicationAcceptedNotification * fix: GroupApplicationAcceptedNotification * fix: NotificationUserInfoUpdate * cicd: robot automated Change * fix: component * fix: getConversationInfo * feat: cron task * feat: cron task * feat: cron task * feat: cron task * feat: cron task * fix: minio config url recognition error * update gomake version * update gomake version * fix: seq conversion bug * fix: redis pipe exec * fix: ImportFriends * fix: A large number of logs keysAndValues length is not even * feat: mark read aggregate write * feat: online status supports redis cluster * feat: online status supports redis cluster * feat: online status supports redis cluster * merge * merge * read seq is written to mongo * read seq is written to mongo * fix: invitation to join group notification * fix: friend op_user_id * feat: optimizing asynchronous context * feat: optimizing memamq size * feat: add GetSeqMessage * feat: GroupApplicationAgreeMemberEnterNotification * feat: GroupApplicationAgreeMemberEnterNotification * feat: go.mod * feat: go.mod * feat: join group notification and get seq * feat: join group notification and get seq * feat: avoid pulling messages from sessions with a large number of max seq values of 0 * feat: API supports gzip * go.mod * fix: nil pointer error on close * fix: listen error * fix: listen error * update go.mod * feat: add log * fix: token parse token value * fix: GetMsgBySeqs boundary issues * fix: sn_ not sort * fix: sn_ not sort * fix: sn_ not sort * fix: jssdk add * fix: jssdk support * fix: jssdk support * fix: jssdk support * fix: the message I sent is not set to read seq in mongodb * fix: cannot modify group member avatars * fix: MemberEnterNotification * fix: MemberEnterNotification * fix: MsgData status * feat: add ApplicationVersion * feat: add ApplicationVersion * feat: add ApplicationVersion --------- Co-authored-by: withchao <[email protected]> * feat: ApplicationVersion move chat (#2813) * fix: GroupApplicationAcceptedNotification * fix: GroupApplicationAcceptedNotification * fix: NotificationUserInfoUpdate * cicd: robot automated Change * fix: component * fix: getConversationInfo * feat: cron task * feat: cron task * feat: cron task * feat: cron task * feat: cron task * fix: minio config url recognition error * update gomake version * update gomake version * fix: seq conversion bug * fix: redis pipe exec * fix: ImportFriends * fix: A large number of logs keysAndValues length is not even * feat: mark read aggregate write * feat: online status supports redis cluster * feat: online status supports redis cluster * feat: online status supports redis cluster * merge * merge * read seq is written to mongo * read seq is written to mongo * fix: invitation to join group notification * fix: friend op_user_id * feat: optimizing asynchronous context * feat: optimizing memamq size * feat: add GetSeqMessage * feat: GroupApplicationAgreeMemberEnterNotification * feat: GroupApplicationAgreeMemberEnterNotification * feat: go.mod * feat: go.mod * feat: join group notification and get seq * feat: join group notification and get seq * feat: avoid pulling messages from sessions with a large number of max seq values of 0 * feat: API supports gzip * go.mod * fix: nil pointer error on close * fix: listen error * fix: listen error * update go.mod * feat: add log * fix: token parse token value * fix: GetMsgBySeqs boundary issues * fix: sn_ not sort * fix: sn_ not sort * fix: sn_ not sort * fix: jssdk add * fix: jssdk support * fix: jssdk support * fix: jssdk support * fix: the message I sent is not set to read seq in mongodb * fix: cannot modify group member avatars * fix: MemberEnterNotification * fix: MemberEnterNotification * fix: MsgData status * feat: add ApplicationVersion * feat: ApplicationVersion move chat --------- Co-authored-by: withchao <[email protected]> * fix: improve condition check. (#2815) --------- Co-authored-by: Monet Lee <[email protected]> Co-authored-by: icey-yu <[email protected]> Co-authored-by: Kürşat Aktaş <[email protected]> Co-authored-by: chao <[email protected]> Co-authored-by: withchao <[email protected]>
- Loading branch information
6 people
authored
Oct 31, 2024
1 parent
646f1b9
commit ee04c15
Showing
23 changed files
with
400 additions
and
476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: Cleanup After Milestone PRs Merged | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: | ||
| - closed | ||
|
|
||
| jobs: | ||
| handle_pr: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/[email protected] | ||
|
|
||
| - name: Get the PR title and extract PR numbers | ||
| id: extract_pr_numbers | ||
| run: | | ||
| # Get the PR title | ||
| PR_TITLE="${{ github.event.pull_request.title }}" | ||
| echo "PR Title: $PR_TITLE" | ||
| # Extract PR numbers from the title | ||
| PR_NUMBERS=$(echo "$PR_TITLE" | grep -oE "#[0-9]+" | tr -d '#' | tr '\n' ' ') | ||
| echo "Extracted PR Numbers: $PR_NUMBERS" | ||
| # Save PR numbers to a file | ||
| echo "$PR_NUMBERS" > pr_numbers.txt | ||
| echo "Saved PR Numbers to pr_numbers.txt" | ||
| # Check if the title matches a specific pattern | ||
| if echo "$PR_TITLE" | grep -qE "^deps: Merge( #[0-9]+)+ PRs into .+"; then | ||
| echo "proceed=true" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "proceed=false" >> $GITHUB_OUTPUT | ||
| fi | ||
| - name: Use extracted PR numbers and label PRs | ||
| if: (steps.extract_pr_numbers.outputs.proceed == 'true' || contains(github.event.pull_request.labels.*.name, 'milestone-merge')) && github.event.pull_request.merged == true | ||
| run: | | ||
| # Read the previously saved PR numbers | ||
| PR_NUMBERS=$(cat pr_numbers.txt) | ||
| echo "Using extracted PR Numbers: $PR_NUMBERS" | ||
| # Loop through each PR number and add label | ||
| for PR_NUMBER in $PR_NUMBERS; do | ||
| echo "Adding 'cherry-picked' label to PR #$PR_NUMBER" | ||
| curl -X POST \ | ||
| -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| https://api.github.com/repos/${{ github.repository }}/issues/$PR_NUMBER/labels \ | ||
| -d '{"labels":["cherry-picked"]}' | ||
| done | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Delete branch after PR close | ||
| if: steps.extract_pr_numbers.outputs.proceed == 'true' || contains(github.event.pull_request.labels.*.name, 'milestone-merge') | ||
| run: | | ||
| BRANCH_NAME="${{ github.event.pull_request.head.ref }}" | ||
| echo "Branch to delete: $BRANCH_NAME" | ||
| git push origin --delete "$BRANCH_NAME" | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| name: Create Pre-Release PR from Milestone | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
| issues: write | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| milestone_name: | ||
| description: 'Milestone name to collect closed PRs from' | ||
| required: true | ||
| default: 'v3.8.2' | ||
| target_branch: | ||
| description: 'Target branch to merge the consolidated PR' | ||
| required: true | ||
| default: 'pre-release-v3.8.2' | ||
|
|
||
| env: | ||
| MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.2' }} | ||
| TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.2' }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BOT_TOKEN: ${{ secrets.BOT_TOKEN }} | ||
| LABEL_NAME: cherry-picked | ||
| TEMP_DIR: /tmp # Using /tmp as the temporary directory | ||
|
|
||
| jobs: | ||
| cherry_pick_milestone_prs: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Setup temp directory | ||
| run: | | ||
| # Create the temporary directory and initialize necessary files | ||
| mkdir -p ${{ env.TEMP_DIR }} | ||
| touch ${{ env.TEMP_DIR }}/pr_numbers.txt | ||
| touch ${{ env.TEMP_DIR }}/commit_hashes.txt | ||
| touch ${{ env.TEMP_DIR }}/pr_title.txt | ||
| touch ${{ env.TEMP_DIR }}/pr_body.txt | ||
| touch ${{ env.TEMP_DIR }}/created_pr_number.txt | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| token: ${{ secrets.BOT_TOKEN }} | ||
|
|
||
| - name: Setup Git User for OpenIM-Robot | ||
| run: | | ||
| # Set up Git credentials for the bot | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "OpenIM-Robot" | ||
| - name: Fetch Milestone ID and Filter PR Numbers | ||
| env: | ||
| MILESTONE_NAME: ${{ env.MILESTONE_NAME }} | ||
| run: | | ||
| # Fetch milestone details and extract milestone ID | ||
| milestones=$(curl -s -H "Authorization: token $BOT_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/milestones") | ||
| milestone_id=$(echo "$milestones" | grep -B3 "\"title\": \"$MILESTONE_NAME\"" | grep '"number":' | head -n1 | grep -o '[0-9]\+') | ||
| if [ -z "$milestone_id" ]; then | ||
| echo "Milestone '$MILESTONE_NAME' not found. Exiting." | ||
| exit 1 | ||
| fi | ||
| echo "Milestone ID: $milestone_id" | ||
| echo "MILESTONE_ID=$milestone_id" >> $GITHUB_ENV | ||
| # Fetch issues for the milestone | ||
| issues=$(curl -s -H "Authorization: token $BOT_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues?milestone=$milestone_id&state=closed&per_page=100") | ||
| > ${{ env.TEMP_DIR }}/pr_numbers.txt | ||
| # Filter PRs that do not have the 'cherry-picked' label | ||
| for pr_number in $(echo "$issues" | jq -r '.[] | select(.pull_request != null) | .number'); do | ||
| labels=$(curl -s -H "Authorization: token $BOT_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels" | jq -r '.[].name') | ||
| if ! echo "$labels" | grep -q "${LABEL_NAME}"; then | ||
| echo "PR #$pr_number does not have the 'cherry-picked' label. Adding to the list." | ||
| echo "$pr_number" >> ${{ env.TEMP_DIR }}/pr_numbers.txt | ||
| else | ||
| echo "PR #$pr_number already has the 'cherry-picked' label. Skipping." | ||
| fi | ||
| done | ||
| # Sort the filtered PR numbers | ||
| sort -n ${{ env.TEMP_DIR }}/pr_numbers.txt -o ${{ env.TEMP_DIR }}/pr_numbers.txt | ||
| echo "Filtered and sorted PR numbers:" | ||
| cat ${{ env.TEMP_DIR }}/pr_numbers.txt || echo "No closed PR numbers found for milestone." | ||
| - name: Fetch Merge Commits for PRs and Generate Title and Body | ||
| run: | | ||
| # Ensure the files are initialized | ||
| > ${{ env.TEMP_DIR }}/commit_hashes.txt | ||
| > ${{ env.TEMP_DIR }}/pr_title.txt | ||
| > ${{ env.TEMP_DIR }}/pr_body.txt | ||
| # Write description to the PR body | ||
| echo "### Description:" >> ${{ env.TEMP_DIR }}/pr_body.txt | ||
| echo "Merging PRs from milestone \`$MILESTONE_NAME\` into target branch \`$TARGET_BRANCH\`." >> ${{ env.TEMP_DIR }}/pr_body.txt | ||
| echo "" >> ${{ env.TEMP_DIR }}/pr_body.txt | ||
| echo "### Need Merge PRs:" >> ${{ env.TEMP_DIR }}/pr_body.txt | ||
| pr_numbers_in_title="" | ||
| # Process sorted PR numbers and generate commit hashes | ||
| for pr_number in $(cat ${{ env.TEMP_DIR }}/pr_numbers.txt); do | ||
| echo "Processing PR #$pr_number" | ||
| pr_details=$(curl -s -H "Authorization: token $BOT_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/pulls/$pr_number") | ||
| pr_title=$(echo "$pr_details" | jq -r '.title') | ||
| merge_commit=$(echo "$pr_details" | jq -r '.merge_commit_sha') | ||
| short_commit_hash=$(echo "$merge_commit" | cut -c 1-7) | ||
| # Append PR details to the body | ||
| echo "- $pr_title: (#$pr_number) ($short_commit_hash)" >> ${{ env.TEMP_DIR }}/pr_body.txt | ||
| if [ "$merge_commit" != "null" ];then | ||
| echo "$merge_commit" >> ${{ env.TEMP_DIR }}/commit_hashes.txt | ||
| echo "#$pr_number" >> ${{ env.TEMP_DIR }}/pr_title.txt | ||
| pr_numbers_in_title="$pr_numbers_in_title #$pr_number" | ||
| fi | ||
| done | ||
| commit_hashes=$(cat ${{ env.TEMP_DIR }}/commit_hashes.txt | tr '\n' ' ') | ||
| first_commit_hash=$(head -n 1 ${{ env.TEMP_DIR }}/commit_hashes.txt) | ||
| cherry_pick_branch="cherry-pick-${first_commit_hash:0:7}" | ||
| echo "COMMIT_HASHES=$commit_hashes" >> $GITHUB_ENV | ||
| echo "CHERRY_PICK_BRANCH=$cherry_pick_branch" >> $GITHUB_ENV | ||
| echo "pr_numbers_in_title=$pr_numbers_in_title" >> $GITHUB_ENV | ||
| - name: Pull and Cherry-pick Commits, Then Push | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BOT_TOKEN: ${{ secrets.BOT_TOKEN }} | ||
| run: | | ||
| # Fetch and pull the latest changes from the target branch | ||
| git fetch origin | ||
| git checkout $TARGET_BRANCH | ||
| git pull origin $TARGET_BRANCH | ||
| # Create a new branch for cherry-picking | ||
| git checkout -b $CHERRY_PICK_BRANCH | ||
| # Cherry-pick the commits and handle conflicts | ||
| for commit_hash in $COMMIT_HASHES; do | ||
| echo "Attempting to cherry-pick commit $commit_hash" | ||
| if ! git cherry-pick "$commit_hash" --strategy=recursive -X theirs; then | ||
| echo "Conflict detected for $commit_hash. Resolving with incoming changes." | ||
| conflict_files=$(git diff --name-only --diff-filter=U) | ||
| echo "Conflicting files:" | ||
| echo "$conflict_files" | ||
| for file in $conflict_files; do | ||
| if [ -f "$file" ]; then | ||
| echo "Resolving conflict for $file" | ||
| git add "$file" | ||
| else | ||
| echo "File $file has been deleted. Skipping." | ||
| git rm "$file" | ||
| fi | ||
| done | ||
| echo "Conflicts resolved. Continuing cherry-pick." | ||
| git cherry-pick --continue | ||
| else | ||
| echo "Cherry-pick successful for commit $commit_hash." | ||
| fi | ||
| done | ||
| # Push the cherry-pick branch to the repository | ||
| git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git" | ||
| git push origin $CHERRY_PICK_BRANCH --force | ||
| - name: Create Pull Request | ||
| run: | | ||
| # Prepare and create the PR | ||
| pr_title="deps: Merge ${{ env.pr_numbers_in_title }} PRs into $TARGET_BRANCH" | ||
| pr_body=$(cat ${{ env.TEMP_DIR }}/pr_body.txt) | ||
| echo "Prepared PR title:" | ||
| echo "$pr_title" | ||
| echo "Prepared PR body:" | ||
| echo "$pr_body" | ||
| # Create the PR using the GitHub API | ||
| response=$(curl -s -X POST -H "Authorization: token $BOT_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| https://api.github.com/repos/${{ github.repository }}/pulls \ | ||
| -d "$(jq -n --arg title "$pr_title" \ | ||
| --arg head "$CHERRY_PICK_BRANCH" \ | ||
| --arg base "$TARGET_BRANCH" \ | ||
| --arg body "$pr_body" \ | ||
| '{title: $title, head: $head, base: $base, body: $body}')") | ||
| pr_number=$(echo "$response" | jq -r '.number') | ||
| echo "$pr_number" > ${{ env.TEMP_DIR }}/created_pr_number.txt | ||
| echo "Created PR #$pr_number" | ||
| - name: Add Label to Created Pull Request | ||
| run: | | ||
| # Add 'milestone-merge' label to the created PR | ||
| pr_number=$(cat ${{ env.TEMP_DIR }}/created_pr_number.txt) | ||
| echo "Adding label to PR #$pr_number" | ||
| curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| -d '{"labels": ["milestone-merge"]}' \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels" | ||
| echo "Added 'milestone-merge' label to PR #$pr_number." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.