From 180ac698f729c151485e7633471e3287dc7455d5 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Wed, 30 Jan 2019 06:38:41 +1000
Subject: [PATCH 1/5] Travis build coverage updates

---
 .travis.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 021066d..f049c55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,14 @@ script:
 - make -C auto clobber
 - make extensions
 - make dist-src
-- make clean; SYSTEM=linux            make 
-- make clean; SYSTEM=linux-osmesa     make
-- make clean; SYSTEM=linux-egl        make
-- make clean; SYSTEM=linux-clang      make 
-- make clean; SYSTEM=linux-clang-egl  make 
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' .                 ; make; popd
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . ; make; popd
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    ; make; popd
+- make clean && SYSTEM=linux            make
+- make clean && SYSTEM=linux-osmesa     make
+- make clean && SYSTEM=linux-egl        make
+- make clean && SYSTEM=linux-clang      make
+- make clean && SYSTEM=linux-clang-egl  make
+- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' .                 && make && popd
+- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . && make && popd
+- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    && make && popd
 addons:
   apt:
     packages:
@@ -21,9 +21,14 @@ addons:
     - dos2unix
     - libosmesa6-dev
     - libegl1-mesa-dev
-  artifacts:
-    bucket: glew
-    s3_region: "us-east-1"
-    paths:
+deploy:
+  provider: s3
+  skip_cleanup: true
+  bucket: glew
+  region: us-east-1
+  acl: public_read
+  paths:
     - $(ls *.zip *.tgz | tr "\n" ":")
     - $(find doc -type f | tr "\n" ":")
+  on:
+    repo: nigels-com/glew

From 70fb6195ae74cad4b1db7327c88eca18f1daf1e8 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Wed, 30 Jan 2019 07:29:48 +1000
Subject: [PATCH 2/5] Travis: disable EGL for now to workaround build failures

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f049c55..c9c8ea3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,12 @@ script:
 - make dist-src
 - make clean && SYSTEM=linux            make
 - make clean && SYSTEM=linux-osmesa     make
-- make clean && SYSTEM=linux-egl        make
+#- make clean && SYSTEM=linux-egl        make
 - make clean && SYSTEM=linux-clang      make
-- make clean && SYSTEM=linux-clang-egl  make
+#- make clean && SYSTEM=linux-clang-egl  make
 - pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' .                 && make && popd
 - pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . && make && popd
-- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    && make && popd
+#- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    && make && popd
 addons:
   apt:
     packages:
@@ -20,7 +20,7 @@ addons:
     - cmake
     - dos2unix
     - libosmesa6-dev
-    - libegl1-mesa-dev
+#    - libegl1-mesa-dev
 deploy:
   provider: s3
   skip_cleanup: true

From fb66d74d148dbf32f53456e842bde34c414f5d36 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Wed, 30 Jan 2019 08:05:30 +1000
Subject: [PATCH 3/5] Travis: S3 credentials

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c9c8ea3..ab0bcd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,9 @@ addons:
 deploy:
   provider: s3
   skip_cleanup: true
-  bucket: glew
+  access_key_id: ${ARTIFACTS_KEY}
+  secret_access_key: ${ARTIFACTS_SECRET}
+  bucket: ${ARTIFACTS_BUCKET}
   region: us-east-1
   acl: public_read
   paths:

From 0cb090a1a9c707f750f2cbbf5183efa57320d01e Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Wed, 30 Jan 2019 20:43:20 +1000
Subject: [PATCH 4/5] Travis: variable-driven artifacts

---
 .travis.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab0bcd8..2be90f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,7 @@ addons:
     - dos2unix
     - libosmesa6-dev
 #    - libegl1-mesa-dev
-deploy:
-  provider: s3
-  skip_cleanup: true
-  access_key_id: ${ARTIFACTS_KEY}
-  secret_access_key: ${ARTIFACTS_SECRET}
-  bucket: ${ARTIFACTS_BUCKET}
-  region: us-east-1
-  acl: public_read
-  paths:
+  artifacts: true
+    paths:
     - $(ls *.zip *.tgz | tr "\n" ":")
     - $(find doc -type f | tr "\n" ":")
-  on:
-    repo: nigels-com/glew

From 8368ad1c3efedb1001bd34a8c87a7663be9873cd Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Wed, 30 Jan 2019 20:55:26 +1000
Subject: [PATCH 5/5] Travis: variable-driven artifacts (again)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2be90f1..aff5bf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ addons:
     - dos2unix
     - libosmesa6-dev
 #    - libegl1-mesa-dev
-  artifacts: true
+  artifacts:
     paths:
     - $(ls *.zip *.tgz | tr "\n" ":")
     - $(find doc -type f | tr "\n" ":")