diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fe2a837..191c3926 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,6 @@ orbs: workflows: unittest-workflow: - when: << pipeline.parameters.GHA_Action >> jobs: - path-filtering/filter: base-revision: main diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml index 77f49da9..62c6c53e 100644 --- a/.circleci/continue-config.yml +++ b/.circleci/continue-config.yml @@ -54,13 +54,15 @@ jobs: command: git clone https://github.com/secretflow/devtools.git ../devtools - run: name: Setup GCS - command: ../devtools/base64_converter.py --str ${gcs_content} --out_file ../gcs.json + command: | + echo ${gcs_content} > ../gcs.data + ../devtools/gcs_setup.py --in_file=../gcs.data --out_file=../gcs.json --min_download - run: name: "build and test" command: | set +e declare -i test_status - bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --jobs 16 --remote_cache=https://storage.googleapis.com/secretflow --google_credentials=../gcs.json --remote_download_minimal | tee test_result.log; test_status=${PIPESTATUS[0]} + bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --jobs 16 | tee test_result.log; test_status=${PIPESTATUS[0]} git clone https://github.com/secretflow/devtools.git sh devtools/rename-junit-xml.sh @@ -91,13 +93,15 @@ jobs: command: git clone https://github.com/secretflow/devtools.git ../devtools - run: name: Setup GCS - command: ../devtools/base64_converter.py --str ${gcs_content} --out_file ../gcs.json + command: | + echo ${gcs_content} > ../gcs.data + ../devtools/gcs_setup.py --in_file=../gcs.data --out_file=../gcs.json --min_download - run: name: "build and test" command: | set +e declare -i test_status - bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --remote_cache=https://storage.googleapis.com/secretflow --google_credentials=../gcs.json --remote_download_minimal | tee test_result.log; test_status=${PIPESTATUS[0]} + bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors | tee test_result.log; test_status=${PIPESTATUS[0]} git clone https://github.com/secretflow/devtools.git sh devtools/rename-junit-xml.sh diff --git a/.github/workflows/circleci_pull_request.yml b/.github/workflows/circleci_pull_request.yml deleted file mode 100644 index 9cef72e4..00000000 --- a/.github/workflows/circleci_pull_request.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Trigger CircleCI (PR) -on: - pull_request_target: - types: [assigned, opened, synchronize, reopened] -jobs: - approve: # First step - runs-on: ubuntu-latest - steps: - - name: Approve - run: echo For security reasons, all pull requests need to be approved first before running any automated CI. $GITHUB_BASE_REF $GITHUB_HEAD_REF - trigger-circleci: - runs-on: ubuntu-latest - needs: [approve] # Require the first step to finish - environment: - name: CI Check # Our dummy environment - steps: - - name: secretflow-yacl-ci - id: secretflow-yacl-ci - uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0 - env: - CCI_TOKEN: ${{ secrets.CCI_TOKEN }} - TARGET_BRANCH: ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/circleci_push.yml b/.github/workflows/circleci_push.yml deleted file mode 100644 index e2ecaf99..00000000 --- a/.github/workflows/circleci_push.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: Trigger CircleCI (Push) -on: - push -jobs: - trigger-circleci: - runs-on: ubuntu-latest - steps: - - name: secretflow-yacl-ci - id: secretflow-yacl-ci - uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0 - env: - CCI_TOKEN: ${{ secrets.CCI_TOKEN }}