diff --git a/.github/scripts/hypo/syncrand.py b/.github/scripts/hypo/syncrand.py index 389d94ad0a4b..19c04fc77d8a 100644 --- a/.github/scripts/hypo/syncrand.py +++ b/.github/scripts/hypo/syncrand.py @@ -27,6 +27,8 @@ .map(''.join).filter(lambda s: s.find('***') == -1 or (s.count('/***')==1 and s.endswith('a/***'))) st_patterns = st.lists(st.sampled_from(['a','?','/','*']), min_size=1, max_size=10)\ .map(''.join).filter(lambda s: s.find('***') == -1 ) +st_patterns = st.lists(st.sampled_from(['a','?','/','*']), min_size=1, max_size=10)\ + .map(''.join).filter(lambda s: s.find('**') == -1 ) st_option = st.fixed_dictionaries({ "option": st.just("--include") | st.just("--exclude"), diff --git a/.github/scripts/command/sync.sh b/.github/scripts/sync/sync.sh similarity index 100% rename from .github/scripts/command/sync.sh rename to .github/scripts/sync/sync.sh diff --git a/.github/scripts/command/sync_cluster.sh b/.github/scripts/sync/sync_cluster.sh similarity index 100% rename from .github/scripts/command/sync_cluster.sh rename to .github/scripts/sync/sync_cluster.sh diff --git a/.github/scripts/command/sync_fsrand.sh b/.github/scripts/sync/sync_fsrand.sh similarity index 100% rename from .github/scripts/command/sync_fsrand.sh rename to .github/scripts/sync/sync_fsrand.sh diff --git a/.github/scripts/command/sync_minio.sh b/.github/scripts/sync/sync_minio.sh similarity index 100% rename from .github/scripts/command/sync_minio.sh rename to .github/scripts/sync/sync_minio.sh diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index def8f80b79c2..edb87bade8c2 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -3,18 +3,22 @@ name: "sync" on: push: branches: - # - 'main' + - 'main' - 'release-**' paths-ignore: - - 'docs/**' - - '**.md' + - '**/sync.yml' + - '**/syncrand_test.py' + - '**/syncrand.py' + - '.github/scripts/sync/*.sh' pull_request: branches: - # - 'main' + - 'main' - 'release-**' - paths-ignore: - - 'docs/**' - - '**.md' + paths: + - '**/sync.yml' + - '**/syncrand_test.py' + - '**/syncrand.py' + - '.github/scripts/sync/*.sh' schedule: - cron: '30 20 * * *' @@ -49,17 +53,17 @@ jobs: - name: Test Sync timeout-minutes: 30 run: | - sudo META=redis .github/scripts/command/sync.sh + sudo META=redis .github/scripts/sync/sync.sh - name: Test Sync with fsrand timeout-minutes: 30 run: | - sudo META=redis .github/scripts/command/sync_fsrand.sh + sudo META=redis .github/scripts/sync/sync_fsrand.sh - name: Test Sync with mino timeout-minutes: 30 run: | - sudo META=redis .github/scripts/command/sync_minio.sh + sudo META=redis .github/scripts/sync/sync_minio.sh - name: Test Sync with multi workers timeout-minutes: 30 @@ -67,7 +71,7 @@ jobs: # not supported algo: "dsa" "ecdsa-sk" "ed25519-sk" types=("ecdsa" "ed25519" "rsa") random_type=${types[$RANDOM % ${#types[@]}]} - sudo CI=true META=redis KEY_TYPE=$random_type .github/scripts/command/sync_cluster.sh + sudo CI=true META=redis KEY_TYPE=$random_type .github/scripts/sync/sync_cluster.sh - name: Log if: always()