Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to libffwaf v1.22.0 #115

Merged
merged 2 commits into from
Feb 10, 2025
Merged

chore: upgrade to libffwaf v1.22.0 #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12266e5
chore: upgrade to libffwaf v1.22.0
RomainMuller Feb 10, 2025
d68275e
Use relative go version identifiers
RomainMuller Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/_test_bare_metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ jobs:
fail-fast: false
matrix:
runs-on: [ macos-15, macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
go-version: [ '1.23', '1.22' ]
go-version: [ stable, oldstable ]
include:
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go version)
- go-version: '1.22'
- go-version: oldstable
waf-log-level: TRACE
name: ${{ matrix.runs-on }} go${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
name: ${{ matrix.runs-on }} ${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
cache: true
cache-dependency-path: "**/go.mod"
# ARM runners (at least during early access) don't have GCC installed
- if: matrix.runs-on == 'arm-4core-linux'
name: Install build requirements (ARM only)
Expand Down
30 changes: 25 additions & 5 deletions .github/workflows/_test_containerized.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,25 @@ on:
workflow_call: # This is called by test.yml

jobs:
go-versions:
runs-on: ubuntu-latest
outputs:
stable: ${{ steps.stable.outputs.go-version }}
oldstable: ${{ steps.oldstable.outputs.go-version }}
steps:
- uses: actions/setup-go@v5
id: oldstable
with:
go-version: 'oldstable'
cache: false
- uses: actions/setup-go@v5
id: stable
with:
go-version: 'stable'
cache: false

test:
needs: [go-versions]
strategy:
fail-fast: false
matrix:
Expand All @@ -16,17 +34,19 @@ jobs:
# RPM-based image
- amazonlinux:2 # pretty popular on AWS workloads
- amazonlinux:2023
go-version: [ "1.23", "1.22" ]
go-version:
- ${{ needs.go-versions.outputs.stable }}
- ${{ needs.go-versions.outputs.oldstable }}
include:
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go, without any particular tag)
- go-version: '1.23'
- go-version: ${{ needs.go-versions.outputs.stable }}
waf-log-level: TRACE
exclude:
# The amazonlinux:2 variant is only relevant for the default go version yum ships (currently 1.22)
- go-version: '1.23'
- go-version: ${{ needs.go-versions.outputs.stable }}
image: amazonlinux:2
# The amazonlinux:2023 variant is only relevant for the default go version yum ships (currently 1.22)
- go-version: '1.23'
- go-version: ${{ needs.go-versions.outputs.stable }}
image: amazonlinux:2023
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) || '' }}
# We use ARM runners when needed to avoid the performance hit of QEMU
Expand All @@ -51,7 +71,7 @@ jobs:
- uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: go-pkg-mod-${{ hashFiles('**/go.sum') }}
key: go-pkg-mod-${{ hashFiles('**/go.mod') }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure about this one @RomainMuller ?

restore-keys: go-pkg-mod-
- name: Create container
id: container
Expand Down