Skip to content

Commit 9bee159

Browse files
vyazelenkovyazelenko
committed
[CI] Remove CMake installation step.
1 parent ff0b993 commit 9bee159

File tree

3 files changed

+12
-40
lines changed

3 files changed

+12
-40
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ concurrency:
1717

1818
env:
1919
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
20-
CMAKE_VERSION: '3.14.7'
2120

2221
permissions:
2322
contents: read
@@ -58,7 +57,7 @@ jobs:
5857
java -Xinternalversion
5958
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
6059
echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
61-
- name: Setup java 8 to run the Gradle script
60+
- name: Setup java 17 to run the Gradle script
6261
uses: actions/setup-java@v4
6362
with:
6463
distribution: 'zulu'
@@ -93,7 +92,7 @@ jobs:
9392
with:
9493
path: ~/.gradle/wrapper
9594
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
96-
- name: Setup java 8 to run the Gradle script
95+
- name: Setup java 17 to run the Gradle script
9796
uses: actions/setup-java@v4
9897
with:
9998
distribution: 'zulu'
@@ -147,10 +146,7 @@ jobs:
147146
run: |
148147
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
149148
sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
150-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
151-
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
152-
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
153-
- name: Setup java 8 to run the Gradle script
149+
- name: Setup java 17 to run the Gradle script
154150
uses: actions/setup-java@v4
155151
with:
156152
distribution: 'zulu'
@@ -190,10 +186,7 @@ jobs:
190186
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
191187
sudo apt-get update
192188
sudo apt-get install -y g++-${{ matrix.version }}
193-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
194-
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
195-
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
196-
- name: Setup java 8 to run the Gradle script
189+
- name: Setup java 17 to run the Gradle script
197190
uses: actions/setup-java@v4
198191
with:
199192
distribution: 'zulu'
@@ -235,10 +228,7 @@ jobs:
235228
echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/focal/ llvm-toolchain-focal-${{ matrix.version }} main" | sudo tee /etc/apt/sources.list.d/llvm.list
236229
sudo apt-get update
237230
sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev libidn11
238-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
239-
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
240-
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
241-
- name: Setup java 8 to run the Gradle script
231+
- name: Setup java 17 to run the Gradle script
242232
uses: actions/setup-java@v4
243233
with:
244234
distribution: 'zulu'
@@ -280,10 +270,7 @@ jobs:
280270
echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.version }} main" | sudo tee /etc/apt/sources.list.d/llvm.list
281271
sudo apt-get update
282272
sudo apt-get install -y clang-${{ matrix.version }}
283-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
284-
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
285-
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
286-
- name: Setup java 8 to run the Gradle script
273+
- name: Setup java 17 to run the Gradle script
287274
uses: actions/setup-java@v4
288275
with:
289276
distribution: 'zulu'
@@ -318,12 +305,7 @@ jobs:
318305
with:
319306
path: ~/.gradle/wrapper
320307
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
321-
- name: Install CMake
322-
run: |
323-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
324-
tar xf cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
325-
echo "cmake-${CMAKE_VERSION}-Darwin-x86_64/CMake.app/Contents/bin" >> $GITHUB_PATH
326-
- name: Setup java 8 to run the Gradle script
308+
- name: Setup java 17 to run the Gradle script
327309
uses: actions/setup-java@v4
328310
with:
329311
distribution: 'zulu'
@@ -358,13 +340,7 @@ jobs:
358340
with:
359341
path: ~/.gradle/wrapper
360342
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
361-
- name: Install CMake
362-
run: |
363-
$client = new-object System.Net.WebClient
364-
$client.DownloadFile("https://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip","cmake-$Env:CMAKE_VERSION-win64-x64.zip")
365-
7z x cmake-$Env:CMAKE_VERSION-win64-x64.zip
366-
echo "cmake-$Env:CMAKE_VERSION-win64-x64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
367-
- name: Setup java 8 to run the Gradle script
343+
- name: Setup java 17 to run the Gradle script
368344
uses: actions/setup-java@v4
369345
with:
370346
distribution: 'zulu'
@@ -402,7 +378,7 @@ jobs:
402378
profile: minimal
403379
toolchain: ${{ matrix.rust }}
404380
override: true
405-
- name: Setup java 8 to run the Gradle script
381+
- name: Setup java 17 to run the Gradle script
406382
uses: actions/setup-java@v4
407383
with:
408384
distribution: 'zulu'
@@ -437,7 +413,7 @@ jobs:
437413
uses: actions/setup-go@v4
438414
with:
439415
go-version: ${{ matrix.version }}
440-
- name: Setup java 8 to run the Gradle script
416+
- name: Setup java 17 to run the Gradle script
441417
uses: actions/setup-java@v4
442418
with:
443419
distribution: 'zulu'

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ concurrency:
1616

1717
env:
1818
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail'
19-
CMAKE_VERSION: '3.14.7'
2019
JAVA_TOOL_OPTIONS: "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
2120

2221
permissions:
@@ -167,10 +166,7 @@ jobs:
167166
- name: Install compiler
168167
run: |
169168
sudo apt-get install -y g++-${{ matrix.version }}
170-
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
171-
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
172-
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
173-
169+
174170
- name: Initialize CodeQL
175171
uses: github/codeql-action/init@v3
176172
with:

‎.github/workflows/slow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
java -Xinternalversion
4343
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
4444
echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
45-
- name: Setup java 8 to run the Gradle script
45+
- name: Setup java 17 to run the Gradle script
4646
uses: actions/setup-java@v3
4747
with:
4848
distribution: 'zulu'

0 commit comments

Comments
 (0)