Merge branch 'main' into go/1.24

This commit is contained in:
Henry Mercer 2024-12-19 16:14:19 +00:00 committed by GitHub
commit 695f3263e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 393 additions and 334 deletions

View file

@ -3,7 +3,7 @@ description: "Checks that we emit a diagnostic if Go is changed after the init s
# only Linux is affected
operatingSystems: ["ubuntu"]
# pinned to a version which does not support statically linked binaries for indirect tracing
versions: ["stable-v2.14.6"]
versions: ["default"]
steps:
- uses: actions/setup-go@v5
with:

View file

@ -3,7 +3,7 @@ description: "Checks that we emit a diagnostic if the `file` program is not inst
# only Linux is affected
operatingSystems: ["ubuntu"]
# pinned to a version which does not support statically linked binaries for indirect tracing
versions: ["stable-v2.14.6"]
versions: ["default"]
steps:
- uses: actions/setup-go@v5
with:

View file

@ -3,7 +3,7 @@ description: "Checks that our workaround for indirect tracing for Go 1.21+ on Li
# only Linux is affected
operatingSystems: ["ubuntu"]
# pinned to a version which does not support statically linked binaries for indirect tracing
versions: ["stable-v2.14.6"]
versions: ["default"]
steps:
- uses: actions/setup-go@v5
with:

View file

@ -10,13 +10,11 @@ steps:
id: init
with:
db-location: "${{ runner.temp }}/customDbLocation"
# Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
tools: ${{ steps.prepare-test.outputs.tools-url }}
- uses: ./../action/.github/actions/setup-swift
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
if: runner.os == 'macOS'
with:
codeql-path: ${{ steps.init.outputs.codeql-path }}
@ -69,8 +67,7 @@ steps:
fi
- name: Check language autodetect for Swift on macOS
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
if: runner.os == 'macOS'
shell: bash
run: |
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}