diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7c7654e..c426bae 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,12 +43,6 @@ jobs: echo "bucket=${{ secrets.S3BUCKET }}" >> $GITHUB_ENV # set ut workdir echo "UT_WORKDIR=${{ github.workspace }}" >> $GITHUB_ENV - - name: Add cn.txn - run: | - cd $GITHUB_WORKSPACE - echo "[cn.txn]" >> ./etc/launch/cn.toml - echo " enable-leak-check = 1" >> ./etc/launch/cn.toml - echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Unit Testing run: | cd $GITHUB_WORKSPACE && make clean && make config @@ -84,12 +78,6 @@ jobs: echo "bucket=${{ secrets.S3BUCKET }}" >> $GITHUB_ENV # set ut workdir echo "UT_WORKDIR=${{ github.workspace }}" >> $GITHUB_ENV - - name: Add cn.txn - run: | - cd $GITHUB_WORKSPACE - echo "[cn.txn]" >> ./etc/launch/cn.toml - echo " enable-leak-check = 1" >> ./etc/launch/cn.toml - echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Unit Testing run: | cd $GITHUB_WORKSPACE && make clean && make config @@ -121,12 +109,6 @@ jobs: uses: matrixorigin/CI/actions/setup-env@main with: setup-java: false - - name: Add cn.txn - run: | - cd $GITHUB_WORKSPACE - echo "[cn.txn]" >> ./etc/launch/cn.toml - echo " enable-leak-check = 1" >> ./etc/launch/cn.toml - echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Prepare ENV run: | cd $GITHUB_WORKSPACE && make clean && make config && make build diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml index 2aacfb7..a6dd54a 100644 --- a/.github/workflows/e2e-standalone.yaml +++ b/.github/workflows/e2e-standalone.yaml @@ -19,12 +19,6 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main - - name: Add cn.txn - run: | - cd $GITHUB_WORKSPACE/head - echo "[cn.txn]" >> ./etc/launch/cn.toml - echo " enable-leak-check = 1" >> ./etc/launch/cn.toml - echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Build MatrixOne run: | cd $GITHUB_WORKSPACE/head && make clean && make build @@ -35,6 +29,8 @@ jobs: echo "" >> ./etc/launch/cn.toml echo '[cn.txn]' >> ./etc/launch/cn.toml echo 'mode = "Optimistic"' >> ./etc/launch/cn.toml + echo " enable-leak-check = 1" >> ./etc/launch/cn.toml + echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml echo "" >> ./etc/launch/tn.toml echo '[tn.txn]' >> ./etc/launch/tn.toml echo 'mode = "Optimistic"' >> ./etc/launch/tn.toml @@ -144,12 +140,6 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main - - name: Add cn.txn - run: | - cd $GITHUB_WORKSPACE/head - echo "[cn.txn]" >> ./etc/launch/cn.toml - echo " enable-leak-check = 1" >> ./etc/launch/cn.toml - echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - name: Build MatrixOne run: | cd $GITHUB_WORKSPACE/head && make clean && make build @@ -158,6 +148,14 @@ jobs: run: | sudo bash -c 'echo -e "127.0.0.1\tcn0" >> /etc/hosts;'; sudo bash -c 'echo -e "127.0.0.1\tcn1" >> /etc/hosts;'; + - name: Add cn.txn + run: | + cd $GITHUB_WORKSPACE/head + echo "" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo "" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo "[cn.txn]" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo " enable-leak-check = 1" >> ./etc/launch-dynamic-with-proxy/cn.toml.base + echo ' max-active-ages = "2m"'>> ./etc/launch-dynamic-with-proxy/cn.toml.base - name: Start MO run: | sudo cat /etc/hosts | grep '127.0.0.1'; @@ -231,6 +229,11 @@ jobs: - name: Set up Go And Java uses: matrixorigin/CI/actions/setup-env@main + - name: Build MatrixOne + run: | + cd $GITHUB_WORKSPACE/head && make clean && make build + git rev-parse --short HEAD + - name: Add cn.txn run: | cd $GITHUB_WORKSPACE/head @@ -238,11 +241,6 @@ jobs: echo " enable-leak-check = 1" >> ./etc/launch/cn.toml echo ' max-active-ages = "2m"'>> ./etc/launch/cn.toml - - name: Build MatrixOne - run: | - cd $GITHUB_WORKSPACE/head && make clean && make build - git rev-parse --short HEAD - - name: echo config run: | cd $GITHUB_WORKSPACE/head diff --git a/.github/workflows/robot.yaml b/.github/workflows/robot.yaml index 9c80a9e..b2d9ebf 100644 --- a/.github/workflows/robot.yaml +++ b/.github/workflows/robot.yaml @@ -119,7 +119,7 @@ jobs: nightly-check: if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} - runs-on: amd64-mo-shanghai-4xlarge32 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml index 9e0467b..0116991 100644 --- a/.github/workflows/utils.yaml +++ b/.github/workflows/utils.yaml @@ -79,7 +79,7 @@ jobs: if: ${{ needs.check_organization_user.outputs.safe_label == '1' || needs.check_organization_user.outputs.in_org == '1' }} name: PR Unit and BVT Test Coverage needs: [check_organization_user] - runs-on: amd64-mo-guangzhou-2xlarge16 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: