Fix CI artifact deployment

stevenmirabito · Dec 26, 2018 · b0f4cf6 · b0f4cf6
1 parent aff5640
commit b0f4cf6
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 67 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,17 +12,22 @@ install:
   - ps: Set-Content "balance_check\\version.py" ( "__version__ = '{0}'" -f ( git describe --tags --always ) )
   - "%PYTHON%\\Scripts\\pip install -e ."
   - "%PYTHON%\\Scripts\\pyinstaller balance-check.spec"
-  - "move dist\\balance-check.exe dist\\balance-check%ARCH%.exe"
+  - ps: |
+      $env:ARCHIVE_VERSION = $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+          # Building a tag
+          $env:ARCHIVE_VERSION = $env:APPVEYOR_REPO_TAG_NAME
+      }
+      7z a dist\balance-check-$env:ARCHIVE_VERSION-win$env:ARCH.zip dist\balance-check.exe
 build: off
 artifacts:
-  - path: "dist\\balance-check.exe"
-  - path: "dist\\balance-check%ARCH%.exe"
-  - path: "dist\\balance-check32.exe"
-  - path: "dist\\balance-check64.exe"
+  - path: "dist\\balance-check*.zip"
 deploy:
   provider: GitHub
+  artifact: /.*\.zip/
+  force_update: true
   auth_token:
-    secure: bDOSWai8o85Ss9rEqEXkfZi27ijVDfMlpb6x910VlobREuINsS3RuG7lvAp+vU4s
+    secure: cQFP/T5Dnyh3SwHoRFsK23P2gyXa5j+ROCMuq4x2nIU5bycGRZO4snTmwX5CJ1pP
   on:
     branch: master
     APPVEYOR_REPO_TAG: true

diff --git a/.travis.yml b/.travis.yml
@@ -1,45 +1,45 @@
 language: python
 matrix:
   include:
-    - os: linux
-      python: 3.7
-      sudo: true
-      dist: xenial
-    - os: osx
-      language: generic
-      env:
-        - BREW_PYTHON_PACKAGE=python@3
+  - os: linux
+    python: 3.7
+    sudo: true
+    dist: xenial
+  - os: osx
+    language: generic
+    env:
+    - BREW_PYTHON_PACKAGE=python@3
 install:
-  - |
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-        if [[ -n "$BREW_PYTHON_PACKAGE" ]]; then
-            brew update
-            if ! brew list --versions "$BREW_PYTHON_PACKAGE" >/dev/null; then
-                brew install "$BREW_PYTHON_PACKAGE"
-            elif ! brew outdated "$BREW_PYTHON_PACKAGE"; then
-                brew upgrade "$BREW_PYTHON_PACKAGE"
-            fi
-        fi
-        pip install virtualenv
-    fi
+- |
+  if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      if [[ -n "$BREW_PYTHON_PACKAGE" ]]; then
+          brew update
+          if ! brew list --versions "$BREW_PYTHON_PACKAGE" >/dev/null; then
+              brew install "$BREW_PYTHON_PACKAGE"
+          elif ! brew outdated "$BREW_PYTHON_PACKAGE"; then
+              brew upgrade "$BREW_PYTHON_PACKAGE"
+          fi
+      fi
+      pip install virtualenv
+  fi
 script:
-  - |
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-        virtualenv ~/virtualenv/python37 -p python3
-        source ~/virtualenv/python37/bin/activate
-    fi
-  - python --version
-  - pip install pyinstaller
-  - echo "__version__ = '$(git describe --tags --always)'" > balance_check/version.py
-  - pip install -e .
-  - pyinstaller balance-check.spec
-  - mv dist/balance-check dist/balance-check-$TRAVIS_OS_NAME
+- |
+  if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      virtualenv ~/virtualenv/python37 -p python3
+      source ~/virtualenv/python37/bin/activate
+  fi
+- python --version
+- pip install pyinstaller
+- echo "__version__ = '$(git describe --tags --always)'" > balance_check/version.py
+- pip install -e .
+- pyinstaller balance-check.spec
+- tar -czvf dist/balance-check-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz dist/balance-check
 deploy:
   provider: releases
   api_key:
-    secure: pMfhJg/io7H5LKb3c1PVoK8vaZnGh4Ggyc9S2A/KMKXNQ5Xb3qrFUgiOlduaA9RwvR5Lj0tmzeTaZHipRqIS5sbgIfrcOm9Dxi+kqSE9Le3lYmZQhTyFLSJJbCcwgZJYgI8iGD3eNJe5j9EFAWHobp2LBEYtTWn+uAeBa6Djd8jenhSQtLSExq55xYOE809FytovfpcsiA917L6puO4hMyVQpPj8Lswlc6VHco21R0P1qvwGnvxIGmiuEXzGSNaeRm6VPxCUEikY6bXZAc6LLwfdH/+eXI5gXScBGpW4BZE6V4u817eOg8npBPtViWzmB+9B5Z3bjQ8J3CQ2e7nqGZ224J+3tfcqzVwPpSdRqjxN4oNLCtHGJ7oDlpLyhmCmKoCF/NyvRoJtpF00sYUIII5UMYoAFeTOVirOXjEYy3LO/QP6jjfP5ifdfXJpugT1sYgRQIep/teHqbN1iNJTyCp7gvJ1/oClhFFGCztNd4QCeg4SmUxyhI4teLGn9xyH5TEMuHliSfQ1hkGPoLdWGvVWjiFIUjJHszfm4yPbzoDvW4eqSX0287TW+osfRBY64JHmPtxyOFYAGnZWMPKbZ0fPO+S7gn/VVVrRfeY99pr8JP34Yaen6biel5bWHYhis+pJAvjBpeZCDd5k1PPRZaAeyPJ2kShwE0+iTIFXAeU=
+    secure: "e/yikLHp6i/ekJfdUfkkzk4B9O0EFZgA8eAgtuxtylda0qIBVbk+FoordKZeGPQTRZjRunDyV81QNs0Bj0Qz01oJBYPVAQIGfivyKgGpSYRn1/0v7lE0fQL/dnx+yIIIzqwuW33uoMcYL/vrZzDaFUhknY4Iqhxl7oqsCYepekLCKNvO9hteAnfHLTjgYICWDhEdpQ65phaB89rHrAxJvsQFEqD1kqrO0iP9ntSKeWe4yWbcVZ8F8UKAMmkukpIJ+0CihVrucOiXPK+VHWVrwwqAVCzdJGNIy50I4issWHaC5tSTg9edFtV8DfYVlEWUTdmjNyU9oNYw+OX1iuufal91tRhvq8DPyxUwdtU5WW5PCFmVlI20S2A+IsxhK2OmsZ2LjPnEqTCINjT850P1yGiGJC1YeZy0pLv147P5zVILoSKZAw/P0N/wjHXi3sHc0Am+mMAD1Gk2EMHibDk7dFj3P/4jAyNK2gc75j70+rarIYp2kpXHBBk9ILN0tqndr5uOcEsE2Hn1E7wChUxa2Kymt14KnkknSLC/SxjtXZCgC35lePI+WjBsPtM73LI1BEEWcFt95VSnRUi5WgxBGRVCpaZNZgo4jnw56mnWenH+ozKW6XdsH+hGtsP+Zz7dVecvmavTwcLK2nyMxl8a6pcIc3Wd1peZ2JvqxgHpf3s="
   file_glob: true
-  file: dist/balance-check*
+  file: dist/balance-check*.tar.gz
   skip_cleanup: true
   on:
     repo: stevenmirabito/balance-check

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Automation tool for checking the balance of gift cards issued by various provide
 Providers marked with <sup>CAPTCHA</sup> will require an [Anti-CAPTCHA](https://anti-captcha.com) API key.
 
 ## Quick Start
-Download the appropriate standalone executable file for your operating system from the [releases page](https://github.com/stevenmirabito/balance-check/releases).
+Download and extract the appropriate standalone executable file for your operating system from the [releases page](https://github.com/stevenmirabito/balance-check/releases).
 
 ### Windows
 
@@ -31,10 +31,10 @@ cd C:\Users\John\Downloads
 
 Or, open the folder in Explorer, hold the `SHIFT` key, and choose "Open Command Prompt Here" from the context menu.
 
-From that command prompt window, run the following to display the full usage message (replace `64` with `32` if you downloaded the 32-bit version):
+From that command prompt window, run the following to display the full usage message:
 
 ```
-balance-check64.exe -h
+balance-check.exe -h
 ```
 
 To configure your Anti-CAPTCHA API key, run the following (replacing `<key>` with your key):
@@ -46,14 +46,14 @@ set ANTI_CAPTCHA_KEY="<key>"
 To run a balance check using the `blackhawk` provider using a CSV on your desktop, you might run the following:
 
 ```
-balance-check64.exe blackhawk C:\Users\John\Desktop\cards.csv
+balance-check.exe blackhawk C:\Users\John\Desktop\cards.csv
 ```
 
 Instead of typing out the full path to the input CSV, you can also drag-and-drop the CSV into the command prompt window after typing the first part of the command.
 
-### macOS
+### macOS & Linux
 
-Open the Terminal (Applications -> Utilities -> Terminal) and `cd` to the directory where you downloaded the binary, e.g.:
+Open a terminal (macOS: Applications -> Utilities -> Terminal) and `cd` to the directory where you downloaded the binary, e.g.:
 
 ```
 cd ~/Downloads
@@ -62,7 +62,7 @@ cd ~/Downloads
 From that termal window, run the following to display the full usage message:
 
 ```
-balance-check-osx -h
+balance-check -h
 ```
 
 To configure your Anti-CAPTCHA API key, run the following (replacing `<key>` with your key):
@@ -74,27 +74,7 @@ export ANTI_CAPTCHA_KEY="<key>"
 To run a balance check using the `blackhawk` provider using a CSV on your desktop, you might run the following:
 
 ```
-balance-check-osx blackhawk ~/Desktop/cards.csv
-```
-
-### Linux
-
-Open a terminal and `cd` to the directory where you downloaded the binary. From that termal window, run the following to display the full usage message:
-
-```
-balance-check-linux -h
-```
-
-To configure your Anti-CAPTCHA API key, run the following (replacing `<key>` with your key):
-
-```
-export ANTI_CAPTCHA_KEY="<key>"
-```
-
-To run a balance check using the `blackhawk` provider using a CSV on your desktop, you might run the following:
-
-```
-balance-check-linux blackhawk ~/Desktop/cards.csv
+balance-check blackhawk ~/Desktop/cards.csv
 ```
 
 ## CSV Format