Update our CI jobs to cover the 3.6 stable branch

The coveralls, prov-compat and provider-compatibiity CI jobs test each
of the stable branches.  We need to add 3.6 to the list in each of those
tests

Fixes openssl/project#1424

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28519)

(cherry picked from commit 5aae731a7d60b2ab9cbc25b8d0956c15f5ee2206)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 7d978919de6278fa2bf515c3a17361799765ec8a..2c595e2e09955f529d31ba8555f4e5e78a1e3673 100644 (file)
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -17,30 +17,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['3.5', '3.4', '3.3', '3.2', '3.0']
+        release: [
+          {
+            branch: '3.6',
+            cppflags: ''
+          }, {
+            branch: '3.5',
+            cppflags: 'CPPFLAGS=-ansi'
+          }, {
+            branch: '3.4',
+            cppflags: 'CPPFLAGS=-ansi'
+          }, {
+            branch: '3.3',
+            cppflags: 'CPPFLAGS=-ansi',
+          }, {
+            branch: '3.2',
+            cppflags: 'CPPFLAGS=-ansi'
+          }, {
+            branch: '3.0',
+            cppflags: 'CPPFLAGS=-ansi'
+          }
+        ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.branch) }}
+      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
     - name: cherry-pick
-      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.branch) }}
+      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
       run: |
            REFEND=$(git rev-parse HEAD)
            REFSTART=$(git rev-parse $REFEND~${{ github.event.pull_request.commits }})
-           git checkout ${{ format('openssl-{0}', matrix.branch) }}
+           git checkout ${{ format('openssl-{0}', matrix.release.branch) }}
            git config user.name "OpenSSL Machine"
            git config user.email "openssl-machine@openssl.org"
            echo Cherry-picking $REFSTART..$REFEND
            git cherry-pick $REFSTART..$REFEND
     - name: config
-      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.branch) }}
-      run: CPPFLAGS=-ansi ./config --strict-warnings --banner=Configured no-asm enable-fips --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump
+      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
+      run: ${{ matrix.release.cppflags }} ./config --strict-warnings --banner=Configured no-asm enable-fips --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump
     - name: make
-      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.branch) }}
+      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
       run: make -s -j4
     - name: make test
-      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.branch) }}
+      if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index e1c59ae1f01bd1d2c769d4fcbae4df7385d548d5..0e0f1fa92137f2e9bb6bb2b9d80ef52c57419d2c 100644 (file)
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -43,6 +43,9 @@ jobs:
           else
           MATRIX=$(cat << EOF
           [{
+              "branch": "openssl-3.6",
+              "extra_config": "no-afalgeng enable-fips enable-tfo"
+            },{
               "branch": "openssl-3.5",
               "extra_config": "no-afalgeng enable-fips enable-tfo"
             },{

diff --git a/.github/workflows/prov-compat-label.yml b/.github/workflows/prov-compat-label.yml
index 4b2523ceda233fb1a6ff30b242e5abd64fae0590..63758d682bf32527532a9301363396e6b8149fe4 100644 (file)
--- a/.github/workflows/prov-compat-label.yml
+++ b/.github/workflows/prov-compat-label.yml
@@ -129,6 +129,10 @@ jobs:
             name: openssl-3.5,
             dir: branch-3.5,
             tgz: branch-3.5.tar.gz,
+          }, {
+            name: openssl-3.6,
+            dir: branch-3.6,
+            tgz: branch-3.6.tar.gz,
           }, {
             name: master,
             dir: branch-master,

diff --git a/.github/workflows/provider-compatibility.yml b/.github/workflows/provider-compatibility.yml
index 4c3c11620568471b5b450cdfe2a3fc37a18436b9..98e5248fc02dcc87716b6719e09961d3e8ca6d6d 100644 (file)
--- a/.github/workflows/provider-compatibility.yml
+++ b/.github/workflows/provider-compatibility.yml
@@ -137,6 +137,11 @@ jobs:
             dir: branch-3.5,
             tgz: branch-3.5.tar.gz,
             extra_config: "",
+          }, {
+            name: openssl-3.6,
+            dir: branch-3.6,
+            tgz: branch-3.6.tar.gz,
+            extra_config: "",
           }, {
             name: master,
             dir: branch-master,
@@ -209,10 +214,10 @@ jobs:
         # Note that releases are not used as a test environment for
         # later providers.  Problems in these situations ought to be
         # caught by cross branch testing before the release.
-        tree_a: [ branch-master, branch-3.5, branch-3.4, branch-3.3,
+        tree_a: [ branch-master, branch-3.6, branch-3.5, branch-3.4, branch-3.3,
                   branch-3.2, branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
-        tree_b: [ branch-master, branch-3.5, branch-3.4, branch-3.3,
+        tree_b: [ branch-master, branch-3.6, branch-3.5, branch-3.4, branch-3.3,
                   branch-3.2, branch-3.0  ]
     steps:
       - name: early exit checks