Skip to content

Commit

Permalink
Bugfix/issue 881 try fix ci (#882)
Browse files Browse the repository at this point in the history 
* ok so the old PR #880 use run_command on develop, but now we merged , the run_command use incorrect one.
* change run_command.yml@bugfix/issue-881-try-fix-ci to run_command.yml@develop
reason: after merge this pr, the position shall point to develop. and we have verified in this workflow this PR already worked. to reduce another additional commit, I think we can forcely merge this one, then try other PRs.
  • Loading branch information
@yokofly
yokofly authored Dec 15, 2024
1 parent db5b1da commit fd739ec
Show file tree
Hide file tree
Showing 9 changed files with 217 additions and 216 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/compatibility_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}

compatibility_test:
if: ${{ github.event.inputs.source!='' }}
Expand Down Expand Up @@ -112,6 +112,6 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
62 changes: 31 additions & 31 deletions .github/workflows/manual_trigger_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
smoke_test_on_arm:
needs: prepare_smoke_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -135,9 +135,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_query_compability_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_query_compatibility_test == 'true' }}
Expand Down Expand Up @@ -211,9 +211,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TP_DEMO_API_KEY: ${{ secrets.TP_DEMO_API_KEY }}
TP_DEMO_SITE_API_KEY: ${{ secrets.TP_DEMO_SITE_API_KEY }}
query_compability_on_arm:
Expand All @@ -238,9 +238,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TP_DEMO_API_KEY: ${{ secrets.TP_DEMO_API_KEY }}
TP_DEMO_SITE_API_KEY: ${{ secrets.TP_DEMO_SITE_API_KEY }}
prepare_unit_test:
Expand Down Expand Up @@ -286,9 +286,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
unit_test_on_arm:
needs: prepare_unit_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -311,9 +311,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_stateless_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_stateless_test == 'true' }}
Expand Down Expand Up @@ -358,9 +358,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
stateless_test_on_arm:
needs: prepare_stateless_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -383,9 +383,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_stateful_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_stateful_test == 'true' }}
Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
if: github.event.inputs.arch == 'x64'
with:
ec2-instance-type: ${{ vars.X64_INSTANCE_TYPE }}
ec2-instance-type: c5.2xlarge
ec2-image-id: ${{ vars.X64_TEST_AMI }}
ec2-volume-size: '40'
submodules: false
Expand All @@ -430,9 +430,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
stateful_test_on_arm:
needs: prepare_stateful_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -455,6 +455,6 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TIMEPLUS_ADDRESS2: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY2: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE2: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
Loading

0 comments on commit fd739ec

Please sign in to comment.