Skip to content

Commit fd128cf

Browse files
authored
chore: update ubuntu runner from 20.04 to latest (#312)
* update workflow runner for cpp benchmarks to `ubuntu-latest` * update google/benchmark and google/googletest versions to work with latest ubuntu version
1 parent 5378675 commit fd128cf

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/catch2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
benchmark:
1313
name: Run Catch2 C++ Benchmark Framework example (v3.x)
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Build and run benchmarks with Catch2

.github/workflows/catch2_v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
benchmark:
1313
name: Run Catch2 C++ Benchmark Framework example (v2.x)
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Build and run benchmarks with Catch2

.github/workflows/ci-results-repo.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
catch2-v2-framework:
8383
name: Run Catch2 C++ Benchmark Framework example (v2.x) - github.com/benchmark-action/github-action-benchmark-results
84-
runs-on: ubuntu-20.04
84+
runs-on: ubuntu-latest
8585
steps:
8686
- uses: actions/checkout@v4
8787
- uses: actions/setup-node@v4
@@ -120,7 +120,7 @@ jobs:
120120

121121
catch2-v3-framework:
122122
name: Run Catch2 C++ Benchmark Framework example (v3.x) - github.com/benchmark-action/github-action-benchmark-results
123-
runs-on: ubuntu-20.04
123+
runs-on: ubuntu-latest
124124
steps:
125125
- uses: actions/checkout@v4
126126
- uses: actions/setup-node@v4
@@ -159,7 +159,7 @@ jobs:
159159

160160
cpp-framework:
161161
name: Run Google C++ Benchmark Framework example - github.com/benchmark-action/github-action-benchmark-results
162-
runs-on: ubuntu-20.04
162+
runs-on: ubuntu-latest
163163
steps:
164164
- uses: actions/checkout@v4
165165
- uses: actions/setup-node@v4

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
catch2-v2-framework:
7979
name: Run Catch2 C++ Benchmark Framework example (v2.x)
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-latest
8181
steps:
8282
- uses: actions/checkout@v4
8383
- uses: actions/setup-node@v4
@@ -114,7 +114,7 @@ jobs:
114114

115115
catch2-v3-framework:
116116
name: Run Catch2 C++ Benchmark Framework example (v3.x)
117-
runs-on: ubuntu-20.04
117+
runs-on: ubuntu-latest
118118
steps:
119119
- uses: actions/checkout@v4
120120
- uses: actions/setup-node@v4
@@ -151,7 +151,7 @@ jobs:
151151

152152
cpp-framework:
153153
name: Run Google C++ Benchmark Framework example
154-
runs-on: ubuntu-20.04
154+
runs-on: ubuntu-latest
155155
steps:
156156
- uses: actions/checkout@v4
157157
- uses: actions/setup-node@v4

.github/workflows/cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
benchmark:
1313
name: Run Google C++ Benchmark Framework example
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Cache Benchmark library

examples/cpp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ benchmark/build: benchmark
1616
mkdir -p benchmark/build
1717

1818
benchmark:
19-
[ -d benchmark ] || git clone --depth=1 --single-branch --branch v1.5.0 https://github.com/google/benchmark.git benchmark
19+
[ -d benchmark ] || git clone --depth=1 --single-branch --branch v1.9.3 https://github.com/google/benchmark.git benchmark
2020

2121
benchmark/googletest: benchmark
22-
[ -d benchmark/googletest ] || git clone --depth=1 --single-branch --branch release-1.10.0 https://github.com/google/googletest.git benchmark/googletest
22+
[ -d benchmark/googletest ] || git clone --depth=1 --single-branch --branch release-1.12.1 https://github.com/google/googletest.git benchmark/googletest
2323

2424
clean:
2525
rm -rf a.out benchmark

0 commit comments

Comments
 (0)