CI: clean up

bison-patches
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CI: clean up

From:	Akim Demaille
Subject:	CI: clean up
Date:	Mon, 21 Oct 2019 09:05:56 +0200
Two commits.

commit 717be0a0f0837a2ee356f42daa475d0bf7d6333d
Author: Akim Demaille <address@hidden>
Date:   Mon Oct 21 08:43:35 2019 +0200

    CI: rename jobs
    
    * .travis.yml (compile, test): Rename as...
    (dist, check): these, which are more traditional for GNU projects.

diff --git a/.travis.yml b/.travis.yml
index 674591cb..4328ca4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ env:
 #    Less dependencies, and little git content (we would like to have none, 
but it's not
 #    an option on Travis).
 stages:
-  - compile
-  - test
+  - dist
+  - check
 
-# The 'test' jobs do not need the repo at all, only the 'compile'
+# The 'check' jobs do not need the repo at all, only the 'dist'
 # does.  Let's save time, bandwith, energy, and polar bears.
 git:
   clone: false
@@ -29,7 +29,7 @@ git:
 # (https://docs.travis-ci.com/user/conditional-builds-stages-jobs/).
 jobs:
   include:
-    - stage: compile
+    - stage: dist
       name: "Make dist"
       git:
         clone: true
@@ -61,7 +61,7 @@ jobs:
         # git history (because git describe --abbrev=4 may use more than 4 
characters if there are
         # conflicts).
         #
-        # So for the sake of the 'test' jobs (that don't even have the repo at 
all), also expose this
+        # So for the sake of the 'check' jobs (that don't even have the repo 
at all), also expose this
         # tarball on a name that only depends on the Travis build number.
         #
         # Without -b -, exit status is always 0.
@@ -77,7 +77,7 @@ jobs:
     # errors asap.
 
     - name: "GCC 9 -O3"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons:
@@ -92,7 +92,7 @@ jobs:
     # ASAN is time consuming, and we timeout the 50min granted by
     # Travis if we run all the tests in one go.  Run in two parts.
     - name: "Clang 9 libc++ and ASAN part 1"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons: &clang9
@@ -108,20 +108,22 @@ jobs:
             - libc++abi-9-dev
       env:
         # Do not use ASAN with ubuntu's libc++: 
https://bugs.llvm.org/show_bug.cgi?id=17379
-        - MATRIX_EVAL="PART=1 CC='clang-9 -fsanitize=address' CXX='clang++-9 
-fsanitize=address -stdlib=libc++'"
+        - MATRIX_EVAL="CC='clang-9 -fsanitize=address' CXX='clang++-9 
-fsanitize=address -stdlib=libc++'"
+        - PART=1
 
     - name: "Clang 9 libc++ and ASAN part 2"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons: *clang9
       env:
         # Do not use ASAN with ubuntu's libc++: 
https://bugs.llvm.org/show_bug.cgi?id=17379
-        - MATRIX_EVAL="PART=2 CC='clang-9 -fsanitize=address' CXX='clang++-9 
-fsanitize=address -stdlib=libc++'"
+        - MATRIX_EVAL="CC='clang-9 -fsanitize=address' CXX='clang++-9 
-fsanitize=address -stdlib=libc++'"
+        - PART=2
 
     # Currently no longer works 
(https://github.com/nemequ/icc-travis/issues/15).
     # - name: "ICC"
-    #   stage: test
+    #   stage: check
     #   # We need the build-aux/install-icc.sh script.
     #   git:
     #     clone: true
@@ -152,7 +154,7 @@ jobs:
         - PART=1
 
     - name: "GCC 8"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons:
@@ -162,7 +164,7 @@ jobs:
         - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
 
     - name: "GCC 7"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons:
@@ -173,7 +175,7 @@ jobs:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 
     - name: "GCC 6"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -186,7 +188,7 @@ jobs:
         - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
 
     - name: "GCC 5"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -199,7 +201,7 @@ jobs:
          - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
 
     - name: "GCC 4.9"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -212,7 +214,7 @@ jobs:
          - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
 
     - name: "GCC 4.8"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -225,7 +227,7 @@ jobs:
          - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
 
     - name: "GCC 4.7"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -238,7 +240,7 @@ jobs:
          - MATRIX_EVAL="CC=gcc-4.7 && CXX=g++-4.7"
 
     - name: "GCC 4.6"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -255,7 +257,7 @@ jobs:
     ## ------- ##
 
     - name: "Clang 8 -O3"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons:
@@ -269,7 +271,7 @@ jobs:
         - CONFIGUREFLAGS='CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3'
 
     - name: "Clang 7"
-      stage: test
+      stage: check
       os: linux
       dist: bionic
       addons:
@@ -282,7 +284,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-7 && CXX='clang++-7 -stdlib=libc++'"
 
     - name: "Clang 6 and libc++"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -297,7 +299,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-6.0 && CXX='clang++-6.0 -stdlib=libc++'"
 
     - name: "Clang 5"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -311,7 +313,7 @@ jobs:
         - MATRIX_EVAL="CC='clang-5.0' CXX='clang++-5.0'"
 
     - name: "Clang 4"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -324,7 +326,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
 
     - name: "Clang 3.9"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -337,7 +339,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
 
     - name: "Clang 3.8"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -351,7 +353,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
 
     - name: "CLang 3.7"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -365,7 +367,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
 
     - name: "Clang 3.6"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -379,7 +381,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
 
     - name: "Clang 3.5"
-      stage: test
+      stage: check
       os: linux
       dist: xenial
       addons:
@@ -393,7 +395,7 @@ jobs:
         - MATRIX_EVAL="CC=clang-3.5 && CXX=clang++-3.5"
 
     - name: "Clang 3.4"
-      stage: test
+      stage: check
       os: linux
       # Not available on Xenial.
       dist: trusty
@@ -407,7 +409,7 @@ jobs:
         - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++'
 
     - name: "Clang 3.3"
-      stage: test
+      stage: check
       os: linux
       # Not available on Xenial.
       dist: trusty
@@ -433,7 +435,7 @@ before_script:
   - echo '|1|bpc51UGxoDZjCPiwRlCStW32trI=|rfh6mLoLZv/vAvOVrpZXI1hTLxg= 
ecdsa-sha2-nistp256 
AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIR+ckMoJTNXHvAQLHWSfrRnrNJGW2ZR6kr5pBVDGCkz1v1RcQ5rleq0NAt9kS3v4hgnuLiEVnK7KDRzcEH3ikc='
 >>~/.ssh/known_hosts
   - chmod 600 ~/.ssh/known_hosts
 
-# Applies only to the jobs that don't have a 'script', i.e., applies to all 
the 'test' jobs, but not the 'compile' one.
+# Applies only to the jobs that don't have a 'script', i.e., applies to all 
the 'check' jobs, but not the 'dist' one.
 script:
   - eval "$MATRIX_EVAL"
   # Beware not too leak $SSH_PRIVATE_KEY.











commit 0073b5ea5f365ad6f5b5d38bf6dbc4ed6165800d
Author: Akim Demaille <address@hidden>
Date:   Mon Oct 21 08:44:21 2019 +0200

    CI: formatting changes
    
    * .travis.yml: Use the single line form of lists, when reduced to a
    singletons.

diff --git a/.travis.yml b/.travis.yml
index 4328ca4d..b1e5d3d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -169,8 +169,7 @@ jobs:
       dist: bionic
       addons:
         apt:
-          packages:
-            - g++-7
+          packages: g++-7
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 
@@ -180,10 +179,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
+          sources: ubuntu-toolchain-r-test
+          packages: g++-6
       env:
         - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
 
@@ -193,10 +190,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
+          sources: ubuntu-toolchain-r-test
+          packages: g++-5
       env:
          - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
 
@@ -206,10 +201,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
+          sources: ubuntu-toolchain-r-test
+          packages: g++-4.9
       env:
          - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
 
@@ -219,10 +212,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.8
+          sources: ubuntu-toolchain-r-test
+          packages: g++-4.8
       env:
          - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
 
@@ -232,10 +223,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.7
+          sources: ubuntu-toolchain-r-test
+          packages: g++-4.7
       env:
          - MATRIX_EVAL="CC=gcc-4.7 && CXX=g++-4.7"
 
@@ -245,10 +234,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.6
+          sources: ubuntu-toolchain-r-test
+          packages: g++-4.6
       env:
          - MATRIX_EVAL="CC=gcc-4.6 && CXX=g++-4.6"
 
@@ -304,8 +291,7 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - llvm-toolchain-xenial-5.0
+          sources: llvm-toolchain-xenial-5.0
           packages:
             - clang-5.0
             - libc++-dev
@@ -318,10 +304,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - llvm-toolchain-xenial-4.0
-          packages:
-            - clang-4.0
+          sources: llvm-toolchain-xenial-4.0
+          packages: clang-4.0
       env:
         - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
 
@@ -331,10 +315,8 @@ jobs:
       dist: xenial
       addons:
         apt:
-          sources:
-            - llvm-toolchain-xenial-3.9
-          packages:
-            - clang-3.9
+          sources: llvm-toolchain-xenial-3.9
+          packages: clang-3.9
       env:
         - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
 
@@ -347,8 +329,7 @@ jobs:
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.8
-          packages:
-            - clang-3.8
+          packages: clang-3.8
       env:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
 
@@ -361,8 +342,7 @@ jobs:
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.7
-          packages:
-            - clang-3.7
+          packages: clang-3.7
       env:
         - MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
 
@@ -375,8 +355,7 @@ jobs:
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.6
-          packages:
-            - clang-3.6
+          packages: clang-3.6
       env:
         - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
 
@@ -389,8 +368,7 @@ jobs:
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.5
-          packages:
-            - clang-3.5
+          packages: clang-3.5
       env:
         - MATRIX_EVAL="CC=clang-3.5 && CXX=clang++-3.5"
 
@@ -401,8 +379,7 @@ jobs:
       dist: trusty
       addons:
         apt:
-          packages:
-            - clang-3.4
+          packages: clang-3.4
       env:
         # No versioned name installed, but beware that Travis installs
         # a more modern clang earlier in the default PATH.
@@ -415,8 +392,7 @@ jobs:
       dist: trusty
       addons:
         apt:
-          packages:
-            - clang-3.3
+          packages: clang-3.3
       env:
         # See comment for 3.4.
         - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++'
[Prev in Thread]
Current Thread
[Next in Thread]
CI: clean up, Akim Demaille <=
Prev by Date: Re: yacc: beware of GCC9 warnings in push mode
Next by Date: Re: yy_state_t
Previous by thread: CI: try GCC9 and Clang9
Next by thread: [patch] yacc.c: Fix a typo
Index(es):
- Date
- Thread