Skip to content

Commit da737fe

Browse files
authored
Revert CMake changes
1 parent 8092492 commit da737fe

38 files changed

Lines changed: 87 additions & 162 deletions

‎.github/actions/setup-cmake/action.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/workflows/build-android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
java -version
5858
gci env:* | sort-object name
5959
new-item "$Env:USERPROFILE\.android\repositories.cfg" -ItemType "file"
60-
echo yes | sdkmanager "ndk-bundle" "cmake;4.1.2" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
60+
echo yes | sdkmanager "ndk-bundle" "cmake;3.22.1" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
6161
- name: Chocolatey
6262
run: |
6363
choco install --no-progress -y ninja

‎.github/workflows/build-ios-mac.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
run: |
5656
sudo chown -R $USER:staff /usr/local
5757
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
58-
- uses: ./.github/actions/setup-cmake
5958
- name: Initialize googletest
6059
run: git submodule update --init --depth=1 third_party/googletest
6160
- name: build

‎.github/workflows/build-posix-latest.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
steps:
4545
- name: Checkout
4646
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
47-
- uses: ./.github/actions/setup-cmake
4847
- name: Initialize googletest
4948
run: git submodule update --init --depth=1 third_party/googletest
5049
- name: Test ${{ matrix.os }} ${{ matrix.config }}

‎.github/workflows/build-ubuntu-2204.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
steps:
4545
- name: Checkout
4646
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
47-
- uses: ./.github/actions/setup-cmake
4847
- name: Initialize googletest
4948
run: git submodule update --init --depth=1 third_party/googletest
5049
- name: Test ${{ matrix.os }} ${{ matrix.config }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
- name: Checkout
4242
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
4343
continue-on-error: true
44-
- uses: ./.github/actions/setup-cmake
4544

4645
# Initializes the CodeQL tools for scanning.
4746
- name: Initialize CodeQL

‎.github/workflows/spm-release.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ jobs:
8484
# port (the optional modules are excluded there too).
8585
submodules: false
8686

87-
- uses: ./.github/actions/setup-cmake
88-
if: ${{ steps.ver.outputs.skip != 'true' }}
89-
9087
- name: Skip if this SPM version is already published
9188
id: pub
9289
if: ${{ steps.ver.outputs.skip != 'true' }}

‎.github/workflows/test-embedding.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
disable-logging: ON
4949
steps:
5050
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
51-
- uses: ./.github/actions/setup-cmake
5251
- name: Install system dependencies
5352
if: matrix.dependencies == 'system'
5453
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libsqlite3-dev ninja-build zlib1g-dev
@@ -89,7 +88,6 @@ jobs:
8988
runs-on: windows-2022
9089
steps:
9190
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
92-
- uses: ./.github/actions/setup-cmake
9391
- name: Configure
9492
run: >
9593
cmake -S tests/embedding -B build-embedding -A x64
@@ -109,7 +107,6 @@ jobs:
109107
mode: [system, fetched]
110108
steps:
111109
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
112-
- uses: ./.github/actions/setup-cmake
113110
- name: Install system dependencies
114111
if: matrix.mode == 'system'
115112
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libsqlite3-dev zlib1g-dev
@@ -155,7 +152,6 @@ jobs:
155152
runs-on: macos-latest
156153
steps:
157154
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
158-
- uses: ./.github/actions/setup-cmake
159155
- name: Configure, install, and consume
160156
run: |
161157
cmake -G Ninja -S . -B build-package \
@@ -184,7 +180,6 @@ jobs:
184180
architectures: [arm64, "arm64;x86_64"]
185181
steps:
186182
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
187-
- uses: ./.github/actions/setup-cmake
188183
- name: Configure
189184
run: >
190185
cmake -G Ninja -S tests/embedding -B build-embedding
@@ -209,7 +204,6 @@ jobs:
209204
zlib-provider: VENDORED
210205
steps:
211206
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
212-
- uses: ./.github/actions/setup-cmake
213207
- name: Configure
214208
run: >
215209
cmake -G Xcode -S tests/embedding -B build-embedding
@@ -229,7 +223,6 @@ jobs:
229223
runs-on: ubuntu-latest
230224
steps:
231225
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
232-
- uses: ./.github/actions/setup-cmake
233226
- name: Configure
234227
run: >
235228
cmake -G Ninja -S tests/embedding -B build-embedding

‎.github/workflows/test-vcpkg.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
transport: [WinHTTP, WinInet]
3232
steps:
3333
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
34-
- uses: ./.github/actions/setup-cmake
3534

3635
- name: Bootstrap vcpkg
3736
run: |
@@ -53,7 +52,6 @@ jobs:
5352
name: Linux (x64-linux)
5453
steps:
5554
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
56-
- uses: ./.github/actions/setup-cmake
5755

5856
- name: Bootstrap vcpkg
5957
run: |
@@ -72,7 +70,6 @@ jobs:
7270
name: macOS (native)
7371
steps:
7472
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
75-
- uses: ./.github/actions/setup-cmake
7673

7774
- name: Bootstrap vcpkg
7875
run: |
@@ -91,7 +88,6 @@ jobs:
9188
name: iOS (arm64-ios cross-compile)
9289
steps:
9390
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
94-
- uses: ./.github/actions/setup-cmake
9591

9692
- name: Bootstrap vcpkg
9793
run: |
@@ -110,7 +106,6 @@ jobs:
110106
name: Android (arm64-v8a API 23 cross-compile)
111107
steps:
112108
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
113-
- uses: ./.github/actions/setup-cmake
114109

115110
- name: Bootstrap vcpkg
116111
run: |

‎.github/workflows/test-win-latest.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050

5151
- name: Checkout
5252
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
53-
- uses: ./.github/actions/setup-cmake
5453

5554
- name: setup-msbuild
5655
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0

0 commit comments

Comments
 (0)