Skip to content

Commit 712ac66

Browse files
gflegarwkparkantiagainst
authored
Re-align main and llvm-head (#5334)
We have a couple of PRs that landed in the `llvm-head` branch that are not in `main`. Merging those into `main` to prevent further divergence between branches. --------- Co-authored-by: Won-Kyu Park <[email protected]> Co-authored-by: Lei Zhang <[email protected]>
1 parent b0ebcfc commit 712ac66

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/llvm-build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ jobs:
3030
- {runner: 'Ubuntu 20.04 ARM64', runs_on: 'ubuntu-20.04', target-os: 'ubuntu', arch: 'arm64'}
3131
- {runner: 'CentOS 7', runs_on: ['self-hosted', 'CPU'], target-os: 'centos', arch: 'x64'}
3232
- {runner: 'AlmaLinux 8', runs_on: ['self-hosted', 'CPU'], target-os: 'almalinux', arch: 'x64'}
33-
- {runner: 'MacOS X64', runs_on: 'macos-12', target-os: 'macos', arch: 'x64'}
34-
- {runner: 'MacOS ARM64', runs_on: 'macos-12', target-os: 'macos', arch: 'arm64'}
35-
# TODO(#2805): add back once the workflow works and runs in comparable time to the other ones
36-
# - {runner: 'Windows Latest', runs_on: 'windows-latest', target-os: 'windows', arch: 'x64'}
33+
- {runner: 'MacOS X64', runs_on: 'macos-13', target-os: 'macos', arch: 'x64'}
34+
- {runner: 'MacOS ARM64', runs_on: 'macos-13', target-os: 'macos', arch: 'arm64'}
35+
- {runner: 'Windows Latest', runs_on: 'windows-latest', target-os: 'windows', arch: 'x64'}
3736

3837
steps:
3938

@@ -127,7 +126,8 @@ jobs:
127126
-DLLVM_BUILD_TOOLS=ON
128127
-DLLVM_ENABLE_ASSERTIONS=ON
129128
-DMLIR_ENABLE_BINDINGS_PYTHON=ON
130-
-DLLVM_ENABLE_PROJECTS="clang;mlir"
129+
-DLLVM_ENABLE_PROJECTS="mlir;llvm"
130+
-DLLVM_ENABLE_DIA_SDK=OFF
131131
-DLLVM_INSTALL_UTILS=ON
132132
-DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU"
133133
-DLLVM_ENABLE_TERMINFO=OFF
@@ -300,6 +300,7 @@ jobs:
300300

301301
- name: Upload LLVM Artifacts to Azure
302302
if: ${{ (github.repository == 'triton-lang/triton') }}
303+
shell: bash -el {0}
303304
run: |
304305
az storage blob upload --account-name oaitriton --auth-mode login --container-name public --file "${{ env.llvm_install_dir }}.tar.gz" --name "llvm-builds/${{ env.llvm_install_dir }}.tar.gz" --overwrite
305306

0 commit comments

Comments
 (0)