From eaf7c1954dccc1be6734e73b937a1a14755cb454 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Wed, 5 Jun 2024 18:03:25 +0200 Subject: [PATCH 1/6] ci: Allow selective triggering of subsets Signed-off-by: Oliver Koenig --- .github/workflows/_ci.yaml | 179 +++++++++++++++++++++++-------- .github/workflows/_watchdog.yaml | 106 +++++++++++++++--- .github/workflows/ci.yaml | 28 ++++- 3 files changed, 254 insertions(+), 59 deletions(-) diff --git a/.github/workflows/_ci.yaml b/.github/workflows/_ci.yaml index 2b4beb0b8..5a8016185 100644 --- a/.github/workflows/_ci.yaml +++ b/.github/workflows/_ci.yaml @@ -1,5 +1,5 @@ name: ~CI, single-arch -run-name: CI-${{ inputs.ARCHITECTURE }} +run-name: CI-${{ inputs.ARCHITECTURE }}-${{ inputs.TESTSUBSET }} on: workflow_call: inputs: @@ -21,20 +21,106 @@ on: description: 'A JSON object containing git url+refs for softwares to be built' required: false default: '{}' + TEST_SUBSET: + type: string + description: | + Subset of tests to run. + Will run all downstream-connected nodes and leaves. + See `ci.yaml` for all options. + default: 'base' + required: false outputs: DOCKER_TAGS: description: 'JSON object containing tags of all docker images built' value: ${{ jobs.collect-docker-tags.outputs.TAGS }} permissions: - contents: read # to fetch code - actions: write # to cancel previous workflows + contents: read # to fetch code + actions: write # to cancel previous workflows packages: write # to upload container jobs: + pre-flight: + runs-on: ubuntu-22.04 + outputs: + BUILD_TRITON: ${{ steps.run-conditions.outputs.BUILD_TRITON }} + BUILD_EQUINOX: ${{ steps.run-conditions.outputs.BUILD_EQUINOX }} + BUILD_MAXTEXT: ${{ steps.run-conditions.outputs.BUILD_MAXTEXT }} + BUILD_LEVANTER: ${{ steps.run-conditions.outputs.BUILD_LEVANTER }} + BUILD_T5X: ${{ steps.run-conditions.outputs.BUILD_T5X }} + BUILD_PAX: ${{ steps.run-conditions.outputs.BUILD_PAX }} + BUILD_GROK: ${{ steps.run-conditions.outputs.BUILD_GROK }} + TEST_JAX: ${{ steps.run-conditions.outputs.TEST_JAX }} + TEST_TRITON: ${{ steps.run-conditions.outputs.TEST_TRITON }} + TEST_MAXTEXT: ${{ steps.run-conditions.outputs.TEST_MAXTEXT }} + TEST_LEVANTER: ${{ steps.run-conditions.outputs.TEST_LEVANTER }} + TEST_UPSTREAM_PAX: ${{ steps.run-conditions.outputs.TEST_UPSTREAM_PAX }} + TEST_UPSTREAM_T5X: ${{ steps.run-conditions.outputs.TEST_UPSTREAM_T5X }} + TEST_ROSETTA_PAX: ${{ steps.run-conditions.outputs.TEST_ROSETTA_PAX }} + TEST_ROSETTA_T5X: ${{ steps.run-conditions.outputs.TEST_ROSETTA_T5X }} + steps: + - name: Check out the repository under ${GITHUB_WORKSPACE} + uses: actions/checkout@v4 + + - name: Validate input `TEST_SUBSET` + shell: bash -x -e {0} + id: validate + run: | + test_subsets=$(echo "${{ inputs.TEST_SUBSET }}" | awk '{$1=$1;print}') + IFS=' ' read -a test_subsets <<< "$test_subsets" + + valid_test_subsets=$(yq '.on.workflow_dispatch.inputs.TEST_SUBSET.options | join(",")' .github/workflows/ci.yaml) + + for test_subset in "${test_subsets[@]}"; do + if [[ $test_subset == "" || "$valid_test_subsets" != *"$test_subset"* ]]; then + message="Invalid value for '' provided ❌. Expected one of: ($valid_test_subsets), Actual: '$test_subset'" + exit 1 + fi + done + + test_subsets=$(IFS=' '; echo "${test_subsets[*]}") + echo "test_subset=$test_subsets" >> "$GITHUB_OUTPUT" + + - name: Compile run-conditions + id: run-conditions + shell: bash -x -e {0} + run: | + if_testset_in() { + local list_of_items="$1" # The list of items as a string + IFS=' ' read -a test_subsets <<< "${{ steps.validate.outputs.test_subset }}" + for test_subset in "${test_subsets[@]}"; do + if [[ $test_subset != "" && "$list_of_items" == *"$test_subset"* ]]; then + echo true + return + fi + done + + echo false + return + } + + echo BUILD_TRITON=$(if_testset_in "base jax triton") >> $GITHUB_OUTPUT + echo BUILD_EQUINOX=$(if_testset_in "base jax equinox") >> $GITHUB_OUTPUT + echo BUILD_MAXTEXT=$(if_testset_in "base jax maxtext") >> $GITHUB_OUTPUT + echo BUILD_LEVANTER=$(if_testset_in "base jax levanter") >> $GITHUB_OUTPUT + echo BUILD_T5X=$(if_testset_in "base jax upstream-t5x rosetta-t5x") >> $GITHUB_OUTPUT + echo BUILD_PAX=$(if_testset_in "base jax upstream-pax rosetta-pax") >> $GITHUB_OUTPUT + echo BUILD_GROK=$(if_testset_in "base jax grok") >> $GITHUB_OUTPUT + + echo TEST_JAX=$(if_testset_in "base jax") >> $GITHUB_OUTPUT + echo TEST_TRITON=${BUILD_TRITON} >> $GITHUB_OUTPUT + echo TEST_MAXTEXT=${BUILD_MAXTEXT} >> $GITHUB_OUTPUT + echo TEST_LEVANTER=${BUILD_LEVANTER} >> $GITHUB_OUTPUT + echo TEST_UPSTREAM_PAX=$(if_testset_in "base jax upstream-pax") >> $GITHUB_OUTPUT + echo TEST_UPSTREAM_T5X=$(if_testset_in "base jax upstream-t5x") >> $GITHUB_OUTPUT + echo TEST_ROSETTA_PAX=$(if_testset_in "base jax upstream-pax rosetta-pax") >> $GITHUB_OUTPUT + echo TEST_ROSETTA_T5X=$(if_testset_in "base jax upstream-t5x rosetta-t5x") >> $GITHUB_OUTPUT + + cat $GITHUB_OUTPUT build-base: uses: ./.github/workflows/_build_base.yaml + needs: pre-flight with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} BUILD_DATE: ${{ inputs.BUILD_DATE }} @@ -61,8 +147,8 @@ jobs: secrets: inherit build-triton: - needs: build-jax - if: inputs.ARCHITECTURE == 'amd64' # Triton does not seem to support arm64 + needs: [pre-flight, build-jax] + if: needs.pre-flight.outputs.BUILD_TRITON == 'true' && inputs.ARCHITECTURE == 'amd64' # Triton does not seem to support arm64 uses: ./.github/workflows/_build.yaml with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} @@ -77,8 +163,9 @@ jobs: secrets: inherit build-equinox: - needs: build-jax + needs: [pre-flight, build-jax] uses: ./.github/workflows/_build.yaml + if: needs.pre-flight.outputs.BUILD_EQUINOX == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} ARTIFACT_NAME: artifact-equinox-build @@ -92,8 +179,8 @@ jobs: secrets: inherit build-maxtext: - needs: build-jax - if: inputs.ARCHITECTURE == 'amd64' + needs: [pre-flight, build-jax] + if: needs.pre-flight.outputs.BUILD_MAXTEXT == 'true' && inputs.ARCHITECTURE == 'amd64' # Triton does not seem to support arm64 uses: ./.github/workflows/_build.yaml with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} @@ -108,12 +195,13 @@ jobs: secrets: inherit build-levanter: - needs: [build-jax] + needs: [pre-flight, build-jax] uses: ./.github/workflows/_build.yaml + if: needs.pre-flight.outputs.BUILD_LEVANTER == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} - ARTIFACT_NAME: "artifact-levanter-build" - BADGE_FILENAME: "badge-levanter-build" + ARTIFACT_NAME: 'artifact-levanter-build' + BADGE_FILENAME: 'badge-levanter-build' BUILD_DATE: ${{ inputs.BUILD_DATE }} BASE_IMAGE: ${{ needs.build-jax.outputs.DOCKER_TAG_MEALKIT }} CONTAINER_NAME: levanter @@ -124,12 +212,13 @@ jobs: secrets: inherit build-upstream-t5x: - needs: build-jax + needs: [pre-flight, build-jax] uses: ./.github/workflows/_build.yaml + if: needs.pre-flight.outputs.BUILD_T5X == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} - ARTIFACT_NAME: "artifact-t5x-build" - BADGE_FILENAME: "badge-t5x-build" + ARTIFACT_NAME: 'artifact-t5x-build' + BADGE_FILENAME: 'badge-t5x-build' BUILD_DATE: ${{ inputs.BUILD_DATE }} BASE_IMAGE: ${{ needs.build-jax.outputs.DOCKER_TAG_MEALKIT }} CONTAINER_NAME: upstream-t5x @@ -139,8 +228,9 @@ jobs: secrets: inherit build-upstream-pax: - needs: build-jax + needs: [pre-flight, build-jax] uses: ./.github/workflows/_build.yaml + if: needs.pre-flight.outputs.BUILD_PAX == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} ARTIFACT_NAME: artifact-pax-build @@ -155,8 +245,9 @@ jobs: secrets: inherit build-rosetta-t5x: - needs: build-upstream-t5x + needs: [pre-flight, build-upstream-t5x] uses: ./.github/workflows/_build_rosetta.yaml + if: needs.pre-flight.outputs.BUILD_T5X == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} BUILD_DATE: ${{ inputs.BUILD_DATE }} @@ -165,8 +256,9 @@ jobs: secrets: inherit build-rosetta-pax: - needs: build-upstream-pax + needs: [pre-flight, build-upstream-pax] uses: ./.github/workflows/_build_rosetta.yaml + if: needs.pre-flight.outputs.BUILD_PAX == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} BUILD_DATE: ${{ inputs.BUILD_DATE }} @@ -175,12 +267,13 @@ jobs: secrets: inherit build-grok: - needs: [build-jax] + needs: [pre-flight, build-jax] uses: ./.github/workflows/_build.yaml + if: needs.pre-flight.outputs.BUILD_GROK == 'true' with: ARCHITECTURE: ${{ inputs.ARCHITECTURE }} - ARTIFACT_NAME: "artifact-grok-build" - BADGE_FILENAME: "badge-grok-build" + ARTIFACT_NAME: 'artifact-grok-build' + BADGE_FILENAME: 'badge-grok-build' BUILD_DATE: ${{ inputs.BUILD_DATE }} BASE_IMAGE: ${{ needs.build-jax.outputs.DOCKER_TAG_MEALKIT }} CONTAINER_NAME: grok @@ -212,7 +305,7 @@ jobs: collect-docker-tags: runs-on: ubuntu-22.04 - if: "!cancelled()" + if: '!cancelled()' needs: - build-base - build-jax @@ -288,8 +381,8 @@ jobs: run: bash rosetta/tests/${{ matrix.TEST_SCRIPT }} test-jax: - needs: build-jax - if: inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a + needs: [pre-flight, build-jax] + if: needs.pre-flight.outputs.TEST_JAX == 'true' && inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a uses: ./.github/workflows/_test_unit.yaml with: TEST_NAME: jax @@ -343,32 +436,32 @@ jobs: # secrets: inherit test-te-multigpu: - needs: build-upstream-pax - if: inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a + needs: [pre-flight, build-upstream-pax] + if: needs.pre-flight.outputs.TEST_UPSTREAM_PAX == 'true' && inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a uses: ./.github/workflows/_test_te.yaml with: TE_IMAGE: ${{ needs.build-upstream-pax.outputs.DOCKER_TAG_FINAL }} secrets: inherit test-upstream-t5x: - needs: build-upstream-t5x - if: inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a + needs: [pre-flight, build-upstream-t5x] + if: needs.pre-flight.outputs.TEST_UPSTREAM_T5X == 'true' && inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a uses: ./.github/workflows/_test_upstream_t5x.yaml with: T5X_IMAGE: ${{ needs.build-upstream-t5x.outputs.DOCKER_TAG_FINAL }} secrets: inherit test-rosetta-t5x: - needs: build-rosetta-t5x - if: inputs.ARCHITECTURE == 'amd64' # no images for arm64 + needs: [pre-flight, build-rosetta-t5x] + if: needs.pre-flight.outputs.TEST_ROSETTA_T5X == 'true' && inputs.ARCHITECTURE == 'amd64' # no images for arm64 uses: ./.github/workflows/_test_t5x_rosetta.yaml with: T5X_IMAGE: ${{ needs.build-rosetta-t5x.outputs.DOCKER_TAG_FINAL }} secrets: inherit test-pallas: - needs: build-jax - if: inputs.ARCHITECTURE == 'amd64' + needs: [pre-flight, build-jax] + if: needs.pre-flight.outputs.TEST_JAX == 'true' && inputs.ARCHITECTURE == 'amd64' # triton doesn't support arm64(?) uses: ./.github/workflows/_test_unit.yaml with: TEST_NAME: pallas @@ -393,8 +486,8 @@ jobs: secrets: inherit test-triton: - needs: build-triton - if: inputs.ARCHITECTURE == 'amd64' # no images for arm64 + needs: [pre-flight, build-triton] + if: needs.pre-flight.outputs.TEST_TRITON == 'true' && inputs.ARCHITECTURE == 'amd64' # no images for arm64 uses: ./.github/workflows/_test_unit.yaml with: TEST_NAME: triton @@ -421,8 +514,8 @@ jobs: secrets: inherit test-levanter: - needs: build-levanter - if: inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a + needs: [pre-flight, build-levanter] + if: needs.pre-flight.outputs.TEST_LEVANTER == 'true' && inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a uses: ./.github/workflows/_test_unit.yaml with: TEST_NAME: levanter @@ -448,8 +541,8 @@ jobs: secrets: inherit test-te: - needs: build-upstream-pax - if: inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a + needs: [pre-flight, build-upstream-pax] + if: needs.pre-flight.outputs.TEST_UPSTREAM_PAX == 'true' && inputs.ARCHITECTURE == 'amd64' # arm64 runners n/a uses: ./.github/workflows/_test_unit.yaml with: TEST_NAME: te @@ -476,16 +569,16 @@ jobs: secrets: inherit test-upstream-pax: - needs: build-upstream-pax - if: inputs.ARCHITECTURE == 'amd64' # no images for arm64 + needs: [pre-flight, build-upstream-pax] + if: needs.pre-flight.outputs.TEST_UPSTREAM_PAX == 'true' && inputs.ARCHITECTURE == 'amd64' # no images for arm64 uses: ./.github/workflows/_test_upstream_pax.yaml with: PAX_IMAGE: ${{ needs.build-upstream-pax.outputs.DOCKER_TAG_FINAL }} secrets: inherit test-rosetta-pax: - needs: build-rosetta-pax - if: inputs.ARCHITECTURE == 'amd64' # no images for arm64 + needs: [pre-flight, build-rosetta-pax] + if: needs.pre-flight.outputs.TEST_ROSETTA_PAX == 'true' && inputs.ARCHITECTURE == 'amd64' # no images for arm64 uses: ./.github/workflows/_test_pax_rosetta.yaml with: PAX_IMAGE: ${{ needs.build-rosetta-pax.outputs.DOCKER_TAG_FINAL }} @@ -516,8 +609,8 @@ jobs: secrets: inherit test-maxtext: - needs: build-maxtext - if: inputs.ARCHITECTURE == 'amd64' # no images for arm64 + needs: [pre-flight, build-maxtext] + if: needs.pre-flight.outputs.TEST_MAXTEXT == 'true' && inputs.ARCHITECTURE == 'amd64' # no images for arm64 uses: ./.github/workflows/_test_maxtext.yaml with: MAXTEXT_IMAGE: ${{ needs.build-maxtext.outputs.DOCKER_TAG_FINAL }} diff --git a/.github/workflows/_watchdog.yaml b/.github/workflows/_watchdog.yaml index 05dcb1d51..9786a43ed 100644 --- a/.github/workflows/_watchdog.yaml +++ b/.github/workflows/_watchdog.yaml @@ -5,16 +5,74 @@ on: types: [created] jobs: - woof: + pre-woof: runs-on: ubuntu-22.04 if: > github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ci') && contains(fromJSON('["ko3n1g","nouiz","joker-eph","yhtang","terrykong","hemildesai","chaserileyroberts","CliveUnger","DwarKapex","mingxu1067","kocchop","SahilJain314","ashors1","maanug-nv","hmonishN","gspschmid"]'), github.actor) + env: + message: ${{ github.event.comment.body }} + outputs: + test_subset: ${{ steps.state.outputs.test_subset }} + steps: + - name: Check out the repository under ${GITHUB_WORKSPACE} + uses: actions/checkout@v4 + + - name: Verify state + shell: bash -x -e {0} + id: state + run: | + test_subsets=$(echo "$message" | awk '{$1=$1;print}' | cut -d' ' -f2-) + IFS=' ' read -a test_subsets <<< "$test_subsets" + + valid_test_subsets=$(yq '.on.workflow_dispatch.inputs.TEST_SUBSET.options | join(",")' .github/workflows/ci.yaml) + + for test_subset in "${test_subsets[@]}"; do + if [[ $test_subset == "" || "$valid_test_subsets" != *"$test_subset"* ]]; then + message="Invalid value for '/ci ' provided ❌. Expected one of: ($valid_test_subsets), Actual: '$test_subset'" + echo "message=$message" >> "$GITHUB_OUTPUT" + exit 1 + fi + done + + test_subsets=$(IFS=' '; echo "${test_subsets[*]}") + + message="About to trigger presubmit CI on '$test_subsets'. Stay tuned for the next update ⏳." + echo "message=$message" >> "$GITHUB_OUTPUT" + echo "test_subset=$test_subsets" >> "$GITHUB_OUTPUT" + + - name: Update PR issue comment + shell: bash -x -e {0} + if: always() + run: | + message="$message + + --- + + Watchdog 🤖: ${{ steps.state.outputs.message }} + + " + + # GitHub needs HTML tags instead of newline chars + message="${message//$'\n'/
}" + + # Fire + curl -L \ + -X PATCH \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }} \ + -d '{"body":"'"$message"'"}' + + woof: + runs-on: ubuntu-22.04 + needs: pre-woof steps: - name: Get PR number - shell: bash + shell: bash -x -e {0} id: get-pr-num run: | PR_URL="${{ github.event.issue.pull_request.url }}" @@ -35,36 +93,54 @@ jobs: console.log('Pull Request Information:', pr.data); return pr.data.head.ref; - - name: Trigger `CI` workflow on subset of tests + - name: Trigger `CI` workflow on subset of tests uses: aurelien-baudet/workflow-dispatch@v2.1.1 id: trigger with: - workflow: "CI" + workflow: 'CI' token: ${{ secrets.GITHUB_TOKEN }} wait-for-completion: false ref: ${{ steps.get-pr-branch.outputs.result }} + inputs: '{ "TEST_SUBSET": "${{ needs.pre-woof.outputs.test_subset }}" }' - - name: Update `GITHUB_STEP_SUMMARY` - shell: bash - run: echo "Click [here](${{ steps.trigger.outputs.workflow-url }}) to navigate to the workflow run." >> $GITHUB_STEP_SUMMARY - - - name: Update PR issue comment - shell: bash - env: - message: ${{ github.event.comment.body }} + - name: Create result message + shell: bash -x -e {0} + id: result + if: always() run: | - message="$message + if [[ "${{ steps.trigger.outcome }}" == "success" ]]; then + dispatch_result_message="presubmit CI was successfully triggered ✅. Click [here](${{ steps.trigger.outputs.workflow-url }}) to navigate to the workflow run." + else + dispatch_result_message="presubmit CI was not successfully triggered ❌. Click [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more information." + fi + + dispatch_result_message="Watchdog 🤖: $dispatch_result_message" + + echo "${{ steps.message.outputs.message }}" >> $GITHUB_STEP_SUMMARY + + # Fetch original commit issue message + message="$message" + + # Remove previous woof-response + message=$(awk -F '' '{print $1}' <<< "$message") + + # Add new woof-response + message="$message --- - Watchdog 🤖: presubmit CI was automatically triggered. Click [here](${{ steps.trigger.outputs.workflow-url }}) to navigate to the workflow run. + $dispatch_result_message + " + + # GitHub needs HTML tags instead of newline chars message="${message//$'\n'/
}" + # Fire curl -L \ -X PATCH \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }} \ - -d '{"body":"'"$message"'"}' \ No newline at end of file + -d '{"body":"'"$message"'"}' diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2797c691c..f5fe54767 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,6 +34,22 @@ on: A comma-separated PACKAGE=URL#REF list to override sources used by build. PACKAGE∊{JAX,XLA,Flax,transformer-engine,T5X,paxml,praxis,maxtext,levanter,haliax,grok,mujuco,mujuco-mpc,gemma,big-vision,common-loop-utils,flaxformer,panopticapi} (case-insensitive) default: '' + TEST_SUBSET: + type: string + options: + - base + - jax + - levanter + - equinox + - triton + - upstream-t5x + - rosetta-t5x + - upstream-pax + - rosetta-pax + - maxtext + - grok + description: Subset of tests to run. Will run all downstream-connected nodes and leaves. + default: 'base' required: false concurrency: @@ -60,6 +76,7 @@ jobs: MANIFEST_ARTIFACT_NAME: ${{ steps.manifest-branch.outputs.MANIFEST_ARTIFACT_NAME }} MANIFEST_BRANCH: ${{ steps.manifest-branch.outputs.MANIFEST_BRANCH }} MERGE_BUMPED_MANIFEST: ${{ steps.manifest-branch.outputs.MERGE_BUMBED_MANIFEST }} + TEST_SUBSET: ${{ steps.testset.outputs.TEST_SUBSET }} steps: - name: Cancel workflow run if the trigger is a draft PR id: cancel-if-draft @@ -113,7 +130,14 @@ jobs: echo "Error: If BUMP_MANIFEST=false, MERGE_BUMPED_MANIFEST cannot be true" >&2 exit 1 fi - + + - name: Set TESTSET + id: testset + shell: bash -x -e {0} + run: | + TEST_SUBSET="${{ inputs.TEST_SUBSET || 'base' }}" + echo "TEST_SUBSET=$TEST_SUBSET" | tee -a $GITHUB_OUTPUT + bump-manifest: needs: metadata runs-on: ubuntu-22.04 @@ -179,6 +203,7 @@ jobs: BUILD_DATE: ${{ needs.metadata.outputs.BUILD_DATE }} MANIFEST_ARTIFACT_NAME: ${{ needs.metadata.outputs.MANIFEST_ARTIFACT_NAME }} SOURCE_URLREFS: ${{ needs.bump-manifest.outputs.SOURCE_URLREFS }} + TEST_SUBSET: ${{ needs.metadata.outputs.TEST_SUBSET }} secrets: inherit arm64: @@ -189,6 +214,7 @@ jobs: BUILD_DATE: ${{ needs.metadata.outputs.BUILD_DATE }} MANIFEST_ARTIFACT_NAME: ${{ needs.metadata.outputs.MANIFEST_ARTIFACT_NAME }} SOURCE_URLREFS: ${{ needs.bump-manifest.outputs.SOURCE_URLREFS }} + TEST_SUBSET: ${{ needs.metadata.outputs.TEST_SUBSET }} secrets: inherit # Only merge if everything succeeds From c144f689d4168db394d794372aea499689dcd635 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Wed, 5 Jun 2024 20:11:05 +0200 Subject: [PATCH 2/6] ci: Remove `pull_request` trigger Signed-off-by: Oliver Koenig --- .github/workflows/ci.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f5fe54767..2771b9384 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,14 +3,6 @@ name: CI on: schedule: - cron: '30 9 * * *' # Pacific Time 01:30 AM in UTC - pull_request: - types: - - opened - - reopened - - ready_for_review - - synchronize - paths-ignore: - - '**.md' workflow_dispatch: inputs: PUBLISH: @@ -78,16 +70,6 @@ jobs: MERGE_BUMPED_MANIFEST: ${{ steps.manifest-branch.outputs.MERGE_BUMBED_MANIFEST }} TEST_SUBSET: ${{ steps.testset.outputs.TEST_SUBSET }} steps: - - name: Cancel workflow run if the trigger is a draft PR - id: cancel-if-draft - if: github.event_name == 'pull_request' && github.event.pull_request.draft == true - run: | - echo "Cancelling workflow for draft PR" - curl -X POST -H "Authorization: token ${{ github.token }}" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/cancel" - while true; do sleep 1; done # blocks execution in case workflow cancellation takes time - - name: Set build date id: date shell: bash -x -e {0} From f5046973985c3245a1eb50eba1e0aa66c0d83cd1 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Wed, 5 Jun 2024 20:14:55 +0200 Subject: [PATCH 3/6] ci: Add olupton to watchdog members Signed-off-by: Oliver Koenig --- .github/workflows/_watchdog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_watchdog.yaml b/.github/workflows/_watchdog.yaml index 9786a43ed..ab78284ef 100644 --- a/.github/workflows/_watchdog.yaml +++ b/.github/workflows/_watchdog.yaml @@ -11,7 +11,7 @@ jobs: github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ci') && - contains(fromJSON('["ko3n1g","nouiz","joker-eph","yhtang","terrykong","hemildesai","chaserileyroberts","CliveUnger","DwarKapex","mingxu1067","kocchop","SahilJain314","ashors1","maanug-nv","hmonishN","gspschmid"]'), github.actor) + contains(fromJSON('["ko3n1g","nouiz","joker-eph","yhtang","terrykong","hemildesai","chaserileyroberts","CliveUnger","DwarKapex","mingxu1067","kocchop","SahilJain314","ashors1","maanug-nv","olupton","hmonishN","gspschmid"]'), github.actor) env: message: ${{ github.event.comment.body }} outputs: From 08c6efb4f04bd5beff4276cb39b2c70230531b56 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Wed, 5 Jun 2024 20:19:31 +0200 Subject: [PATCH 4/6] ci: Trigger presubmit ci on push to master Signed-off-by: Oliver Koenig --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2771b9384..841887fd9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,6 +3,9 @@ name: CI on: schedule: - cron: '30 9 * * *' # Pacific Time 01:30 AM in UTC + push: + branches: + - main workflow_dispatch: inputs: PUBLISH: From a2e834fc2fd62b7e59f27509b04a8777bc56fc2c Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Wed, 5 Jun 2024 20:43:23 +0200 Subject: [PATCH 5/6] ci: Fix global state of env var Signed-off-by: Oliver Koenig --- .github/workflows/_watchdog.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_watchdog.yaml b/.github/workflows/_watchdog.yaml index ab78284ef..1ccf6de19 100644 --- a/.github/workflows/_watchdog.yaml +++ b/.github/workflows/_watchdog.yaml @@ -4,6 +4,9 @@ on: issue_comment: types: [created] +env: + message: ${{ github.event.comment.body }} + jobs: pre-woof: runs-on: ubuntu-22.04 @@ -12,8 +15,6 @@ jobs: github.event.issue.pull_request && startsWith(github.event.comment.body, '/ci') && contains(fromJSON('["ko3n1g","nouiz","joker-eph","yhtang","terrykong","hemildesai","chaserileyroberts","CliveUnger","DwarKapex","mingxu1067","kocchop","SahilJain314","ashors1","maanug-nv","olupton","hmonishN","gspschmid"]'), github.actor) - env: - message: ${{ github.event.comment.body }} outputs: test_subset: ${{ steps.state.outputs.test_subset }} steps: From 3fc4716c721dc96246fdafeedac72a1e4cc93e38 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 14 Jun 2024 15:53:53 +0200 Subject: [PATCH 6/6] fix choice input Signed-off-by: Oliver Koenig --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 841887fd9..1fc623e6a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ on: PACKAGE∊{JAX,XLA,Flax,transformer-engine,T5X,paxml,praxis,maxtext,levanter,haliax,grok,mujuco,mujuco-mpc,gemma,big-vision,common-loop-utils,flaxformer,panopticapi} (case-insensitive) default: '' TEST_SUBSET: - type: string + type: choice options: - base - jax