Skip to content

Commit 0e4c8e6

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # .github/workflows/build-macos.yml
2 parents 122db1d + 9152cfb commit 0e4c8e6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/build-alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
zts: false
2121

2222
name: "ALPINE_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}"
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-latest
2424
container:
2525
image: 'alpine:3.20.1'
2626
timeout-minutes: 45

.github/workflows/build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
zts: false
2121

2222
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}"
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-latest
2424
timeout-minutes: ${{ matrix.asan && 360 || 60 }}
2525

2626
services:

0 commit comments

Comments
 (0)