From e8a8b1c8450305c58be31e81cf1098372b76ba79 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 15 Sep 2022 22:35:56 -0700 Subject: [PATCH] fix changed-files paths --- .../workflows/build-and-push-image-ssh.yml | 8 ++--- .github/workflows/build-and-push-image.yml | 8 ++--- .github/workflows/main.pr.yml | 24 ++++++++++---- .github/workflows/merge.pr.yml | 32 +++++++++---------- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-and-push-image-ssh.yml b/.github/workflows/build-and-push-image-ssh.yml index 25a6cfdf2..49b92690f 100644 --- a/.github/workflows/build-and-push-image-ssh.yml +++ b/.github/workflows/build-and-push-image-ssh.yml @@ -114,10 +114,10 @@ jobs: files: | ${{ inputs.file }} ${{ inputs.files-to-diff }} - lerna\.json - \.github/workflows/merge\.pr\.yml - \.github/workflows/build-and-push-image\.yml - \.github/actions/build-and-publish-image-ssh/action\.yml + lerna.json + .github/workflows/merge.pr.yml + .github/workflows/build-and-push-image.yml + .github/actions/build-and-publish-image-ssh/action.yml - name: Set environment variables shell: bash diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index 1d393d0f2..a15a51246 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -105,10 +105,10 @@ jobs: files: | ${{ inputs.file }} ${{ inputs.files-to-diff }} - lerna\.json - \.github/workflows/merge\.pr\.yml - \.github/workflows/build-and-push-image\.yml - \.github/actions/build-and-publish-image/action\.yml + lerna.json + .github/workflows/merge.pr.yml + .github/workflows/build-and-push-image.yml + .github/actions/build-and-publish-image/action.yml - name: Set environment variables shell: bash diff --git a/.github/workflows/main.pr.yml b/.github/workflows/main.pr.yml index 1914aa42a..9cf3e5392 100644 --- a/.github/workflows/main.pr.yml +++ b/.github/workflows/main.pr.yml @@ -65,12 +65,22 @@ jobs: path: node base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} files: | - yarn\.lock - lerna\.json - package\.json - modules/**/package\.json - modules/**/CMakeLists\.txt - modules/**/*\.(c|h|ts|js|cu|cuh|cpp|hpp|json|cmake|tsconfig) + yarn.lock + lerna.json + package.json + modules/**/*.c + modules/**/*.h + modules/**/*.ts + modules/**/*.js + modules/**/*.cu + modules/**/*.cuh + modules/**/*.cpp + modules/**/*.hpp + modules/**/*.json + modules/**/*.cmake + modules/**/*.tsconfig + modules/**/package.json + modules/**/CMakeLists.txt - name: Check if GitHub Actions or devel main Dockerfile changed id: dev_changed @@ -79,7 +89,7 @@ jobs: path: node base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} files: | - dev/dockerfiles/devel/main\.Dockerfile + dev/dockerfiles/devel/main.Dockerfile - name: Update runner env env: diff --git a/.github/workflows/merge.pr.yml b/.github/workflows/merge.pr.yml index a4de76acf..fc056f261 100644 --- a/.github/workflows/merge.pr.yml +++ b/.github/workflows/merge.pr.yml @@ -21,9 +21,9 @@ jobs: file: dev/dockerfiles/devel/main.Dockerfile manual-build: ${{ github.event_name == 'workflow_dispatch' }} files-to-diff: | - \.npmrc + .npmrc modules - yarn\.lock + yarn.lock build-args: | "UCX_VERSION=1.12.1" @@ -39,10 +39,10 @@ jobs: file: dev/dockerfiles/devel/package.Dockerfile manual-build: ${{ github.event_name == 'workflow_dispatch' }} files-to-diff: | - \.npmrc + .npmrc modules - yarn\.lock - dev/dockerfiles/devel/main\.Dockerfile + yarn.lock + dev/dockerfiles/devel/main.Dockerfile build-args: | "CUDAARCHS=ALL" "SCCACHE_IDLE_TIMEOUT=32768" @@ -77,7 +77,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/cudf.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|rmm|cuda|cudf) manual-build: ${{ github.event_name == 'workflow_dispatch' }} @@ -95,7 +95,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/cuml.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|rmm|cuda|cudf|cuml) manual-build: ${{ github.event_name == 'workflow_dispatch' }} @@ -113,7 +113,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/cugraph.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|rmm|cuda|cudf|cugraph) manual-build: ${{ github.event_name == 'workflow_dispatch' }} @@ -131,7 +131,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/cuspatial.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|rmm|cuda|cudf|cuspatial) manual-build: ${{ github.event_name == 'workflow_dispatch' }} @@ -149,7 +149,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/glfw.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|glfw|webgl) manual-build: ${{ github.event_name == 'workflow_dispatch' }} @@ -167,7 +167,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/sql.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/(core|rmm|cuda|cudf|sql) manual-build: ${{ github.event_name == 'workflow_dispatch' }} build-args: | @@ -187,8 +187,8 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/main.Dockerfile files-to-diff: | - \.npmrc - modules/(core|cuda|glfw|webgl|rmm|cudf|sql|cuml|cugraph|cuspatial|deck\.gl|jsdom) + .npmrc + modules/(core|cuda|glfw|webgl|rmm|cudf|sql|cuml|cugraph|cuspatial|deck.gl|jsdom) manual-build: ${{ github.event_name == 'workflow_dispatch' }} build-args: | "UCX_VERSION=1.12.1" @@ -207,7 +207,7 @@ jobs: devel: devel-main file: dev/dockerfiles/runtime/demo.Dockerfile files-to-diff: | - \.npmrc + .npmrc modules/demo manual-build: ${{ github.event_name == 'workflow_dispatch' }} build-args: | @@ -224,7 +224,7 @@ jobs: image: runtime-notebook file: dev/dockerfiles/runtime/notebook.Dockerfile files-to-diff: | - \.npmrc - **/*\.ipynb + .npmrc + **/*.ipynb modules/demo manual-build: ${{ github.event_name == 'workflow_dispatch' }}