diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index 0702ce93e0aab..6221afd481938 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -50,9 +50,6 @@ on: description: 'Artifacts retention period' type: string default: 3 - ref: - type: string - required: false outputs: build_conclusion: @@ -146,7 +143,6 @@ jobs: with: sparse-checkout: | devops/actions - ref: ${{ inputs.ref || github.sha }} # Cleanup will be run after all actions are completed. - name: Register cleanup after job is finished uses: ./devops/actions/cleanup diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index a36e8cc118adb..90bd23eafb1b7 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -21,6 +21,7 @@ on: - '.github/workflows/sycl-windows-*.yml' - '.github/workflows/sycl-macos-*.yml' - '.github/workflows/sycl-nightly.yml' + - '.github/workflows/sycl-rel-nightly.yml' - 'devops/containers/**' - 'devops/actions/build_container/**' diff --git a/.github/workflows/sycl-rel-nightly.yml b/.github/workflows/sycl-rel-nightly.yml index ebd61e87756c3..96c691451965b 100644 --- a/.github/workflows/sycl-rel-nightly.yml +++ b/.github/workflows/sycl-rel-nightly.yml @@ -36,10 +36,10 @@ jobs: secrets: inherit with: build_cache_root: "/__w/" - build_artifact_suffix: v6 + build_artifact_suffix: default build_configure_extra_args: '--hip --cuda' merge_ref: '' - ref: sycl-rel-6_0_0 + build_ref: sycl-rel-6_0_0 # We upload the build for people to download/use, override its name and # prefer widespread gzip compression. @@ -118,10 +118,12 @@ jobs: if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }} uses: ./.github/workflows/sycl-windows-build.yml with: + merge_ref: '' + build_ref: sycl-rel-6_0_0 + # We upload both Linux/Windows build via Github's "Releases" # functionality, make sure Linux/Windows names follow the same pattern. artifact_archive_name: sycl_windows.tar.gz - build_ref: sycl-rel-6_0_0 e2e-win: needs: build-win diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml index 23fc3291e2fc8..f7e13df7a97c7 100644 --- a/.github/workflows/sycl-windows-build.yml +++ b/.github/workflows/sycl-windows-build.yml @@ -18,6 +18,12 @@ on: description: 'Filter matches for the changed files in the PR' default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]' required: false + merge_ref: + description: | + Commit-ish to merge post-checkout if non-empty. Must be reachable from + the default_branch input paramter. + type: string + default: 'FETCH_HEAD' artifact_archive_name: type: string default: llvm_sycl.tar.gz @@ -100,6 +106,7 @@ jobs: with: path: src ref: ${{ inputs.build_ref || github.sha }} + merge_ref: ${{ inputs.merge_ref }} cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\" - name: Configure shell: cmd diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml index a82c2b7814d75..b43eb21878621 100644 --- a/.github/workflows/sycl-windows-precommit.yml +++ b/.github/workflows/sycl-windows-precommit.yml @@ -20,6 +20,7 @@ on: - '.github/workflows/sycl-precommit-aws.yml' - '.github/workflows/sycl-macos-*.yml' - '.github/workflows/sycl-nightly.yml' + - '.github/workflows/sycl-rel-nightly.yml' - 'devops/containers/**' - 'devops/actions/build_container/**'