Skip to content

Commit 111357e

Browse files
authored
Merge branch 'master' into master
2 parents 3c9ba9f + d3cc5f8 commit 111357e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/build-osx-wizmode.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
build:
1616
# custom libpng build fails a test on macos-latest (11.x)
17-
runs-on: macos-10.15
17+
runs-on: macos-13
1818
steps:
1919
- uses: actions/checkout@v2
2020
with:

.github/workflows/build-ubuntu-nonwizard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# well on Windows or Mac. You can convert this to a matrix build if you need
1313
# cross-platform coverage.
1414
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- uses: actions/checkout@v2

.github/workflows/build-ubuntu-wizmode.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# well on Windows or Mac. You can convert this to a matrix build if you need
1313
# cross-platform coverage.
1414
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
1616

1717
steps:
1818
- uses: actions/checkout@v2

.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
analyze:
1717
name: Analyze
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
permissions:
2020
actions: read
2121
contents: read
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
language: [ 'cpp', 'ruby' ]
27+
language: [ 'cpp' ]
2828
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
2929
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3030

@@ -43,7 +43,7 @@ jobs:
4343
4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
46+
uses: github/codeql-action/init@v3
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,6 +71,6 @@ jobs:
7171
run: cmake --build . --config $BUILD_TYPE -- -j 4
7272

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
74+
uses: github/codeql-action/analyze@v3
7575
with:
7676
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)