Skip to content

Commit

Permalink
Disable windows, fix missing fields
Browse files Browse the repository at this point in the history
  • Loading branch information
ianayl committed Sep 13, 2024
1 parent a4a1c03 commit 52f5dc3
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 62 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ on:
have dynamic `needs` dependencies between jobs.
type: boolean
default: false
required: false
skip_reason:
description: |
Reason for skipping the build.
type: string
default: "inputs.skip-reason set to true."
required: false

outputs:
build_conclusion:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/sycl-linux-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
reset_gpu: true
reset_intel_gpu: true
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
# - name: E2E tests on Intel Arc A-Series Graphics
# runner: '["Linux", "arc"]'
Expand Down Expand Up @@ -233,12 +233,10 @@ jobs:
image: ${{ matrix.image }}
image_options: ${{ matrix.image_options }}
target_devices: ${{ matrix.target_devices }}
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
reset_gpu: ${{ matrix.reset_intel_gpu }}
install_drivers: ${{ matrix.install_drivers }}
use_dev_igc: ${{ matrix.use_dev_igc }}
env: ${{ matrix.env || '{}' }}
skip_run: ${{ matrix.skip_run || 'false' }}
tests_selector: "benchmark"

ref: ${{ github.sha }}
merge_ref: ''
Expand Down
117 changes: 59 additions & 58 deletions .github/workflows/sycl-windows-precommit.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,59 @@
name: SYCL Pre Commit on Windows

on:
pull_request:
branches:
- sycl
- sycl-devops-pr/**
- llvmspirv_pulldown
- sycl-rel-**
# Do not run builds if changes are only in the following locations
paths-ignore:
- '.github/ISSUE_TEMPLATE/**'
- '.github/CODEOWNERS'
- 'sycl/doc/**'
- 'sycl/gdb/**'
- 'clang/docs/**'
- '**.md'
- '**.rst'
- '.github/workflows/sycl-linux-*.yml'
- '.github/workflows/sycl-precommit-aws.yml'
- '.github/workflows/sycl-macos-*.yml'
- '.github/workflows/sycl-nightly.yml'
- 'devops/containers/**'
- 'devops/actions/build_container/**'

permissions: read-all

concurrency:
# Cancel a currently running workflow from the same PR, branch or tag.
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
detect_changes:
uses: ./.github/workflows/sycl-detect-changes.yml

build:
needs: [detect_changes]
if: |
always() && success()
&& github.repository == 'intel/llvm'
uses: ./.github/workflows/sycl-windows-build.yml
with:
changes: ${{ needs.detect_changes.outputs.filters }}

e2e:
needs: build
# Continue if build was successful.
if: |
always()
&& !cancelled()
&& needs.build.outputs.build_conclusion == 'success'
uses: ./.github/workflows/sycl-windows-run-tests.yml
with:
name: Intel GEN12 Graphics with Level Zero
runner: '["Windows","gen12"]'
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
extra_lit_opts: --param gpu-intel-gen12=True
# name: SYCL Pre Commit on Windows
#
# on:
# pull_request:
# branches:
# - sycl
# - sycl-devops-pr/**
# - llvmspirv_pulldown
# - sycl-rel-**
# # Do not run builds if changes are only in the following locations
# paths-ignore:
# - '.github/ISSUE_TEMPLATE/**'
# - '.github/CODEOWNERS'
# - 'sycl/doc/**'
# - 'sycl/gdb/**'
# - 'clang/docs/**'
# - '**.md'
# - '**.rst'
# - '.github/workflows/sycl-linux-*.yml'
# - '.github/workflows/sycl-precommit-aws.yml'
# - '.github/workflows/sycl-macos-*.yml'
# - '.github/workflows/sycl-nightly.yml'
# - 'devops/containers/**'
# - 'devops/actions/build_container/**'
#
# permissions: read-all
#
# concurrency:
# # Cancel a currently running workflow from the same PR, branch or tag.
# group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
# cancel-in-progress: true
#
# jobs:
# detect_changes:
# uses: ./.github/workflows/sycl-detect-changes.yml
#
# build:
# needs: [detect_changes]
# if: |
# always() && success()
# && github.repository == 'intel/llvm'
# uses: ./.github/workflows/sycl-windows-build.yml
# with:
# changes: ${{ needs.detect_changes.outputs.filters }}
#
# e2e:
# needs: build
# # Continue if build was successful.
# if: |
# always()
# && !cancelled()
# && needs.build.outputs.build_conclusion == 'success'
# uses: ./.github/workflows/sycl-windows-run-tests.yml
# with:
# name: Intel GEN12 Graphics with Level Zero
# runner: '["Windows","gen12"]'
# sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
# extra_lit_opts: --param gpu-intel-gen12=True
#

0 comments on commit 52f5dc3

Please sign in to comment.