From c40e15ba538833cbcbbeffa14d93d575011a4c26 Mon Sep 17 00:00:00 2001 From: Nathan Weinberg Date: Mon, 14 Oct 2024 13:03:38 -0400 Subject: [PATCH 1/2] chore: rename 'basic-workflow-tests' to 'e2e-custom' the test file name is changing in the CLI repo ergo it must be changed here as well Signed-off-by: Nathan Weinberg --- .github/workflows/e2e-nvidia-a10g-x4.yml | 2 +- .github/workflows/e2e-nvidia-t4-x1.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-nvidia-a10g-x4.yml b/.github/workflows/e2e-nvidia-a10g-x4.yml index fc7e949c..d7aa977d 100644 --- a/.github/workflows/e2e-nvidia-a10g-x4.yml +++ b/.github/workflows/e2e-nvidia-a10g-x4.yml @@ -142,7 +142,7 @@ jobs: run: | . venv/bin/activate cd instructlab - SKIP_TRAIN=1 ./scripts/basic-workflow-tests.sh -mFM + SKIP_TRAIN=1 ./scripts/e2e-custom.sh -mFM - name: Add comment to PR if the workflow failed if: failure() && steps.check_pr.outputs.is_pr == 'true' diff --git a/.github/workflows/e2e-nvidia-t4-x1.yml b/.github/workflows/e2e-nvidia-t4-x1.yml index 2b496b00..8f68f4df 100644 --- a/.github/workflows/e2e-nvidia-t4-x1.yml +++ b/.github/workflows/e2e-nvidia-t4-x1.yml @@ -144,7 +144,7 @@ jobs: working-directory: ./instructlab run: | . venv/bin/activate - ./scripts/basic-workflow-tests.sh -msq + ./scripts/e2e-custom.sh -msq stop-runner: name: Stop external EC2 runner From 08674c21a01343d4def9fbbc15caea9dcfc6b551 Mon Sep 17 00:00:00 2001 From: Nathan Weinberg Date: Mon, 14 Oct 2024 13:27:01 -0400 Subject: [PATCH 2/2] mergify: fix ci/cd autolabeling Signed-off-by: Nathan Weinberg --- .github/mergify.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 77f1240b..2ddacc50 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -74,10 +74,11 @@ pull_request_rules: conditions: - or: - files=.github/mergify.yml - - files=.github/workflows/**/* + - files~=^\.github/(actions|workflows)/ + - files=scripts/ruff.sh + - files=.pre-commit-config.yaml - files=.pylintrc - - files=.spellcheck-en-custom.txt - - files=.spellcheck.yml + - files~=^\.spellcheck[^/]+$ - files=tox.ini - files=.markdownlint-cli2.yaml actions: