From 15664fe3e69e85f43ccfe83f4bd98495eb7d7400 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 14 Dec 2021 11:13:35 +0300 Subject: [PATCH 1/5] [CI] Change label for pre-commit job runner --- .github/workflows/sycl_precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 20f3199c2f766..346ffd8670d35 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -25,7 +25,7 @@ jobs: if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint')) uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl with: - build_runs_on: "sycl-precommit-linux" + build_runs_on: "build" build_cache_root: "/__w/" build_cache_size: "8G" build_artifact_suffix: "default" From fdda3664328b95e2b43acb64d7d0ced32cafe3d8 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 14 Dec 2021 13:42:21 +0300 Subject: [PATCH 2/5] change nightly label as well --- .github/workflows/sycl_nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index c3e1918b9a106..84f43545f55ba 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -10,7 +10,7 @@ jobs: if: github.repository == 'intel/llvm' uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl with: - build_runs_on: sycl-precommit-linux + build_runs_on: build build_github_cache: true build_cache_root: "/__w/" build_artifact_suffix: default From 7fd2a99443dbafa01bdbff809e2e40ccc6791509 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 14 Dec 2021 13:55:03 +0300 Subject: [PATCH 3/5] add to precommit --- .github/workflows/sycl_nightly.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index 84f43545f55ba..d89a0ecf57237 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -4,6 +4,10 @@ on: workflow_dispatch: schedule: - cron: '0 3 * * *' + pull_request: + paths: + - 'devops/containers/ubuntu2004_preinstalled.Dockerfile' + - '.github/workflows/sycl_nightly.yml' jobs: ubuntu2004_build_test: From 514a57f2532970de007275319324172b6d91c953 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 14 Dec 2021 13:59:23 +0300 Subject: [PATCH 4/5] refactor --- .github/workflows/sycl_nightly.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index d89a0ecf57237..ab7d18eb8543d 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -28,33 +28,30 @@ jobs: with: name: sycl_linux_default path: devops/ - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + - name: Build and Push Container (with drivers) + uses: ./devops/actions/build_container with: - registry: ghcr.io + push: ${{ github.event_name != 'pull_request' }} + file: ubuntu2004_preinstalled username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and Push Container (with drivers) - uses: docker/build-push-action@v2 - with: - push: true build-args: | base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers base_tag=latest tags: | ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }} ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest - context: ${{ github.workspace }}/devops - file: ${{ github.workspace }}/devops/containers/ubuntu2004_preinstalled.Dockerfile - name: Build and Push Container (no drivers) - uses: docker/build-push-action@v2 + uses: ./devops/actions/build_container with: - push: true + push: ${{ github.event_name != 'pull_request' }} + file: ubuntu2004_preinstalled + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} build-args: | base_image=ghcr.io/intel/llvm/ubuntu2004_base base_tag=latest tags: | ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }} ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers - context: ${{ github.workspace }}/devops - file: ${{ github.workspace }}/devops/containers/ubuntu2004_preinstalled.Dockerfile + From 85847f6f49a9602eb694bc5aa58dea3600a77a56 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 14 Dec 2021 20:01:36 +0300 Subject: [PATCH 5/5] post-commit as well --- .github/workflows/sycl_post_commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml index c105ee34665a5..b81113f47c9c8 100644 --- a/.github/workflows/sycl_post_commit.yml +++ b/.github/workflows/sycl_post_commit.yml @@ -11,7 +11,7 @@ jobs: with: build_cache_root: "/__w/llvm" build_github_cache: true - build_artifact_suffix: default + build_artifact_suffix: build linux_no_assert: name: Linux (no assert) uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl