Skip to content

Commit ce20ca4

Browse files
committed
fix merge conflict resolution error
Signed-off-by: Tom Jakubowski <tom@prospective.dev>
1 parent 34ec5e5 commit ce20ca4

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

.github/actions/install-deps/action.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ runs:
6262
with:
6363
cmake-version: "3.29.6"
6464

65-
# Use system cmake on arm64 Linux (the setup-cmake action doesn't support arm64 Linux)
66-
- name: Install cmake (arm64 Linux)
67-
if: ${{ inputs.arch == 'aarch64' && runner.os == 'Linux' }}
68-
shell: bash
69-
run: |
70-
dnf install -y cmake
71-
7265
- name: Install pnpm
7366
uses: pnpm/action-setup@v3
7467
with:

0 commit comments

Comments
 (0)