From 02b7ae90f1753e295c322d17db0ff3e85c4e7281 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 16 May 2018 21:55:04 -0400
Subject: [PATCH] Some fixups to the AppVeyor and Travis CIs: rearranged
 artifact name parts to match existing ones, changed "platform" to "arch"
 wherever possible, changed "osx" to "darwin" in artifacts. Also added the
 AppVeyor badge to the README.

---
 .appveyor.yml | 10 ++++++----
 .travis.yml   | 19 ++++++++++---------
 README.md     |  3 ++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e5e83dab..577f982b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -48,10 +48,11 @@ build_script:
   - cd %APPVEYOR_BUILD_FOLDER%
 
 after_build:
-  - if %platform%==x64 ( set "platform=amd64" ) else ( set "platform=386" )
+  - if %platform%==x64 ( set "arch=amd64" ) else ( set "arch=386" )
   - if %APPVEYOR_REPO_TAG%==true ( set "version=%APPVEYOR_REPO_TAG_NAME%" )
     else ( set "version=%APPVEYOR_REPO_BRANCH%" )
-  - set "artifact=%linking%-windows-%compiler%-%platform%-%version%"
+  - if %linking%==shared ( set "artifact=shared" ) else ( set "artifact=%compiler%-static" )
+  - set "artifact=%version%-windows-%arch%-%artifact%"
   - 7z a libui-%artifact%.zip .\%outdir%\libui.* ui.h ui_windows.h
   - 7z l libui-%artifact%.zip
   - 7z a examples-%artifact%.zip .\%outdir%\*.exe
@@ -66,7 +67,8 @@ artifacts:
 deploy:
   provider: GitHub
   artifact: libui, examples
-  auth_token:
-    secure: "2l/602m6FkqAB9TTIAkPX3Erfwg9jVTlf/Inmf2dWcbOrJJzK/WrCUIgY3B4ngly"
+  # TODO https://www.appveyor.com/docs/deployment/github/
+  #auth_token:
+    #secure: "2l/602m6FkqAB9TTIAkPX3Erfwg9jVTlf/Inmf2dWcbOrJJzK/WrCUIgY3B4ngly"
   on:
     appveyor_repo_tag: true # deploy on tag push only
diff --git a/.travis.yml b/.travis.yml
index 7c48f9a2..1358aca9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,21 +39,21 @@ include: &toolchain_osx_amd64
 # Each entry below will trigger an extra, parallel build on Travis.
 matrix:
   include:
-    - env: linking=shared platform=amd64
+    - env: linking=shared arch=amd64
       <<: *toolchain_linux_amd64
-    - env: linking=static platform=amd64
+    - env: linking=static arch=amd64
       <<: *toolchain_linux_amd64
-    - env: linking=shared platform=386
+    - env: linking=shared arch=386
       <<: *toolchain_linux_386
-    - env: linking=static platform=386
+    - env: linking=static arch=386
       <<: *toolchain_linux_386
-    - env: linking=shared platform=amd64
+    - env: linking=shared arch=amd64
       <<: *toolchain_osx_amd64
-    - env: linking=static platform=amd64
+    - env: linking=static arch=amd64
       <<: *toolchain_osx_amd64
 
 install:
-  - if [[ "${platform}" == "386" ]]; then
+  - if [[ "${arch}" == "386" ]]; then
       export CFLAGS=-m32;
       export CXXFLAGS=-m32;
       export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig;
@@ -73,10 +73,11 @@ script:
 after_success:
   - ls -lR build/out
   - file build/out/test
-  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then cp ui.h ui_darwin.h build/out/; fi
+  - export platform="$TRAVIS_OS_NAME"
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then cp ui.h ui_darwin.h build/out/; export platform=darwin; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ui.h ui_unix.h   build/out/; fi
   - if [[ "x${TRAVIS_TAG}" != "x" ]]; then export version=${TRAVIS_TAG}; else export version=${TRAVIS_BRANCH}; fi
-  - export artifact=${linking}-${TRAVIS_OS_NAME}-${platform}-${version}
+  - export artifact=${version}-${platform}-${arch}-${linking}
   - pushd build/out
   - tar -czvf libui-${artifact}.tgz libui.* *.h
   - tar -czvf examples-${artifact}.tgz `find . -type f ! -name "*.*"`
diff --git a/README.md b/README.md
index de83d890..4b789be3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # libui: a portable GUI library for C
 
 This README is being written.<br>
-[![Build Status](https://travis-ci.org/andlabs/libui.svg?branch=master)](https://travis-ci.org/andlabs/libui)
+[![Build Status, Linux and macOS](https://travis-ci.org/andlabs/libui.svg?branch=master)](https://travis-ci.org/andlabs/libui)<br>
+[![Build Status, Windows](https://ci.appveyor.com/api/projects/status/ouyk78c52mmisa31?svg=true)](https://ci.appveyor.com/project/andlabs/libui)
 
 ## Announcements