additional master->release switches (CI tests)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bcf2e1d5ea2a660f46868add9911d210600d3386..9738c1bd45b61d9c35f060fa03353b6c56b84c8a 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,8 +143,9 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - release
                 - dev
+                - master
     jobs:
       # Run daily long regression tests
       - regression-test

diff --git a/.github/workflows/linux-kernel.yml b/.github/workflows/linux-kernel.yml
index 35871ff08506a93f674cd079252f71f1537742a3..124f7777828fdabe4db14875d8dddac19fe3d2a4 100644 (file)
--- a/.github/workflows/linux-kernel.yml
+++ b/.github/workflows/linux-kernel.yml
@@ -2,7 +2,7 @@ name: linux-kernel
 
 on:
   pull_request:
-    branches: [ dev, master, actionsTest ]
+    branches: [ dev, release, actionsTest ]
 
 jobs:
   test:

diff --git a/.travis.yml b/.travis.yml
index 226d4c0154ee5e9756936a0c57b9ef47e36d3119..ee473733c2b49756eecff8cb00e31e5442e82e66 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ git:
 branches:
   only:
   - dev
+  - release
   - master
   - travisTest
 
@@ -162,33 +163,33 @@ matrix:
         - make -C tests checkTag
         - tests/checkTag "$TRAVIS_BRANCH"
 
-    # tests for master branch and cron job only
+    # tests for release branch and cron job only
     - name: OS-X    # ~13mn
-      if: branch = master
+      if: branch = release
       os: osx
       script:
         - make test
         - make -C lib all
 
     - name: zbuff test
-      if: branch = master
+      if: branch = release
       script:
         - make -C tests test-zbuff
 
     - name: Versions Compatibility Test   # 11.5mn
-      if: branch = master
+      if: branch = release
       script:
         - make -C tests versionsTest
 
     - name: thread sanitizer   # ~29mn
-      if: branch = master
+      if: branch = release
       script:
         - make clang38install
         - CC=clang-3.8 make tsan-test-zstream
         - CC=clang-3.8 make tsan-fuzztest
 
     - name: PPC64LE + Fuzz test  # ~13mn
-      if: branch = master
+      if: branch = release
       arch: ppc64le
       script:
         - cat /proc/cpuinfo
@@ -196,28 +197,28 @@ matrix:
 
     - name: Qemu PPC64 + Fuzz test  # ~13mn, presumed Big-Endian (?)
       dist: trusty  # note : PPC64 cross-compilation for Qemu tests seems broken on Xenial
-      if: branch = master
+      if: branch = release
       script:
         - make ppcinstall
         - make ppc64fuzz
 
     # note : we already have aarch64 tests on hardware
     - name: Qemu aarch64 + Fuzz Test (on Xenial)    # ~14mn
-      if: branch = master
+      if: branch = release
       dist: xenial
       script:
         - make arminstall
         - make aarch64fuzz
 
     - name: zlib wrapper test    # ~7.5mn
-      if: branch = master
+      if: branch = release
       script:
         - make gpp6install valgrindinstall
         - make -C zlibWrapper test
         - make -C zlibWrapper valgrindTest
 
     - name: LZ4, thread pool, and partial libs tests    # ~4mn
-      if: branch = master
+      if: branch = release
       script:
         - make lz4install
         - make -C tests test-lz4
@@ -229,7 +230,7 @@ matrix:
 
     # meson dedicated test
     - name: Xenial (Meson + clang)    # ~15mn
-      if: branch = master
+      if: branch = release
       dist: xenial
       language: cpp
       compiler: clang