Skip to content

Commit 1ffb1ef

Browse files
[Github] Remove install-ninja/setup-windows
This patch backports a couple of patches that Tom and I submitted recently to drop the usages of these actions. This allows us to delete the usages in llvm/actions while keeping CI running in the release branch.
1 parent 33e1a55 commit 1ffb1ef

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

.github/workflows/hlsl-test-all.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ jobs:
5252
repository: llvm/offload-golden-images
5353
ref: main
5454
path: golden-images
55-
- name: Setup Windows
56-
if: runner.os == 'Windows'
57-
uses: llvm/actions/setup-windows@main
58-
with:
59-
arch: amd64
6055
- name: Build DXC
6156
run: |
6257
cd DXC

.github/workflows/libclang-abi-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101
ref: ${{ github.sha }}
102102
repo: ${{ github.repository }}
103103
steps:
104-
- name: Install Ninja
105-
uses: llvm/actions/install-ninja@42d80571b13f4599bbefbc7189728b64723c7f78 # main
106104
- name: Download source code
107105
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
108106
with:

.github/workflows/premerge.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ jobs:
146146
with:
147147
max-size: "2000M"
148148
- name: Install Ninja
149-
uses: llvm/actions/install-ninja@main
149+
run: |
150+
brew install ninja
150151
- name: Build and Test
151152
run: |
152153
source <(git diff --name-only HEAD~1...HEAD | python3 .ci/compute_projects.py)

.github/workflows/release-binaries.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,6 @@ jobs:
199199
with:
200200
ref: ${{ needs.prepare.outputs.ref }}
201201

202-
- name: Install Ninja
203-
uses: llvm/actions/install-ninja@a1ea791b03c8e61f53a0e66f2f73db283aa0f01e # main
204-
205-
- name: Setup Windows
206-
if: startsWith(runner.os, 'Windows')
207-
uses: llvm/actions/setup-windows@main
208-
with:
209-
arch: amd64
210-
211202
- name: Set Build Prefix
212203
id: setup-stage
213204
shell: bash

0 commit comments

Comments
 (0)