Skip to content

Commit 290956b

Browse files
authored
ci: rollout macos-12, go1.21 and add macos-15, go1.23 and amazonlinux:2023 to align with the smoke-tests (#113)
Signed-off-by: Eliott Bouhana <[email protected]>
1 parent d79b264 commit 290956b

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

.github/workflows/_test_bare_metal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
runs-on: [ macos-14, macos-13, macos-12, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
11-
go-version: [ '1.22', '1.21' ]
10+
runs-on: [ macos-15, macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
11+
go-version: [ '1.23', '1.22' ]
1212
include:
1313
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go version)
1414
- go-version: '1.22'

.github/workflows/_test_containerized.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,21 @@ jobs:
1313
- golang:{0}-alpine
1414
- golang:{0}-bookworm
1515
- golang:{0}-bullseye
16-
- golang:{0}-buster
1716
# RPM-based image
1817
- amazonlinux:2 # pretty popular on AWS workloads
19-
go-version: [ "1.23-rc", "1.22", "1.21" ]
18+
- amazonlinux:2023
19+
go-version: [ "1.23", "1.22" ]
2020
include:
2121
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go, without any particular tag)
22-
- go-version: '1.23-rc'
22+
- go-version: '1.23'
2323
waf-log-level: TRACE
2424
exclude:
25-
# Prune inexistent build images (debian buster is on LTS but won't get new go version images)
26-
- go-version: '1.21'
27-
image: golang:{0}-buster
28-
# Prune inexistent build images (debian buster is on LTS but won't get new go version images)
29-
- go-version: '1.22'
30-
image: golang:{0}-buster
31-
# Prune inexistent build images (debian buster is on LTS but won't get new go version images)
32-
- go-version: '1.23-rc'
33-
image: golang:{0}-buster
3425
# The amazonlinux:2 variant is only relevant for the default go version yum ships (currently 1.22)
35-
- go-version: '1.21'
26+
- go-version: '1.23'
3627
image: amazonlinux:2
28+
# The amazonlinux:2023 variant is only relevant for the default go version yum ships (currently 1.22)
29+
- go-version: '1.23'
30+
image: amazonlinux:2023
3731
name: ${{ matrix.arch }} ${{ format(matrix.image, matrix.go-version) }} go${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
3832
# We use ARM runners when needed to avoid the performance hit of QEMU
3933
runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux' }}
@@ -70,7 +64,7 @@ jobs:
7064
-eGOMODCACHE="/go/pkg/mod" \
7165
"${{ format(matrix.image, matrix.go-version) }}"
7266
- name: Install AmazonLinux 2 requirements
73-
if: matrix.image == 'amazonlinux:2'
67+
if: matrix.image == 'amazonlinux:2' || matrix.image == 'amazonlinux:2023'
7468
run: |-
7569
sudo docker exec -i gha-${{ github.run_id }} \
7670
yum install -y golang

0 commit comments

Comments
 (0)