Skip to content

Commit

Permalink
update force sync scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Ji Bin <[email protected]>
  • Loading branch information
matrixji committed May 3, 2023
1 parent 38b4fdb commit ca263ec
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/syncup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ jobs:
to: '1.1'
- from: '2.2.0'
to: '2.2.0'
- from: '2.3.0'
to: '2.3.0'
steps:
- name: Checkout target repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ matrix.syncup.to }}
persist-credentials: false

- name: Sync upstream changes
id: sync
uses: aormsby/[email protected]
Expand All @@ -35,7 +36,6 @@ jobs:
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
upstream_sync_branch: ${{ matrix.syncup.from }}
upstream_sync_repo: milvus-io/milvus
# upstream_repo_access_token: ${{ secrets.UPSTREAM_REPO_SECRET }}
git_config_pull_rebase: true
test_mode: false

Expand All @@ -48,5 +48,4 @@ jobs:
run: echo "There were no new commits."

- name: Show value of 'has_new_commits'
run: echo ${{ steps.sync.outputs.has_new_commits }}

run: echo ${{ steps.sync.outputs.has_new_commits }}
24 changes: 24 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
# Forked Milvus and More

This is a forked repository of [milvus-io/milvus](https://github.com/milvus-io/milvus) with some additional things.

These additional things may include below areas:

- A build scripts/patches to build Milvus on Windows, also try to release prebuilt binaries.
- A continuously enhanced version of Milvus 1.1

## About Branches

We just sync the below branches from the upstream repository:

- master, the main branch of Milvus
- 1.1, the 1.1 branch
- 2.2.0, the 2.2 branch
- 2.3.0, the 2.3 branch


And below feature branches are added for additional things, I'll try to keep maintain them while I have time:
- windows-dev, a branch for managing the build scripts/patches for Windows
- 1.1-enhanced, a branch for managing the enhanced version of Milvus 1.1

Other branches are not guaranteed to be maintained. And I'll also remove some if they are not used for a long time.

0 comments on commit ca263ec

Please sign in to comment.