Merge pull request #106 from haskell/deploy

Fix broken GitHub Releases deployment

Author: maoe

.travis.yml

@@ -156,16 +156,16 @@ script:
 # EOF
 
 before_deploy:
-  - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
-  - gzip -f threadscope.$TRAVIS_OS_NAME
+  - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER
+  - gzip -f threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER
 
 deploy:
   provider: releases
   api_key:
-    secure: "CLdDbxzqQRTU6wMRqyMutoprbgr8o6fQfIYZc7DBkbRi1r6bOpJl/2Bmob6FYC1XhMsdeBhZfLy0a0MqcU4LNbToLtR8yKN+SvmfEUQn3novk69vfI5KipFqLLeduN4oHgGXSdjIdck3nF/ze8kB2ottJUNdp8J3UxAgMwS9AF8="
-  file: threadscope.$TRAVIS_OS_NAME.gz
+    secure: RzNO2ZivMrDR5JZUZI/Dquc5B1QaMm9BIB06jKOLM/IxeoRKf8HXw1+OqTmMzssGdOxXDTsY7wpagVXD31Y+7K6b1f/zKzTIPwLC/W3QTj1ooFOMqwELGZZxnZPFDld68K/O+jOuJZZZ8QMEJPMfKRR/7vVOWvM/L0h9jIeY8Vo=
+  file: threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER.gz
   skip_cleanup: true
   on:
     repo: haskell/ThreadScope
     tags: true
-    condition: "$HC = ghc-8.6.5"
+    condition: "$TRAVIS_COMPILER = ghc-8.8.2"

.travis/deploy.patch

@@ -8,16 +8,16 @@ index d21f854..6443253 100644
  # EOF
 +
 +before_deploy:
-+  - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
-+  - gzip -f threadscope.$TRAVIS_OS_NAME
++  - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER
++  - gzip -f threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER
 +
 +deploy:
 +  provider: releases
 +  api_key:
-+    secure: "CLdDbxzqQRTU6wMRqyMutoprbgr8o6fQfIYZc7DBkbRi1r6bOpJl/2Bmob6FYC1XhMsdeBhZfLy0a0MqcU4LNbToLtR8yKN+SvmfEUQn3novk69vfI5KipFqLLeduN4oHgGXSdjIdck3nF/ze8kB2ottJUNdp8J3UxAgMwS9AF8="
-+  file: threadscope.$TRAVIS_OS_NAME.gz
++    secure: RzNO2ZivMrDR5JZUZI/Dquc5B1QaMm9BIB06jKOLM/IxeoRKf8HXw1+OqTmMzssGdOxXDTsY7wpagVXD31Y+7K6b1f/zKzTIPwLC/W3QTj1ooFOMqwELGZZxnZPFDld68K/O+jOuJZZZ8QMEJPMfKRR/7vVOWvM/L0h9jIeY8Vo=
++  file: threadscope.$TRAVIS_OS_NAME.$TRAVIS_COMPILER.gz
 +  skip_cleanup: true
 +  on:
 +    repo: haskell/ThreadScope
 +    tags: true
-+    condition: "$HC = ghc-8.6.5"
++    condition: "$TRAVIS_COMPILER = ghc-8.8.2"

.travis/osx.patch

@@ -37,12 +37,18 @@ index 8d435cb..a8af409 100644
    - |
    - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
    - cat cabal.project || true
-@@ -124,7 +124,7 @@ script:
+@@ -124,7 +124,14 @@ script:
    - touch cabal.project
    - |
      echo "packages: ${PKGDIR_threadscope}" >> cabal.project
--  - |
-+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cp ${PKGDIR_threadscope}/cabal.project.osx cabal.project; fi
+   - |
++    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
++      echo "constraints: gtk +have-quartz-gtk" >> cabal.project
++      echo "package *"                         >> cabal.project
++      echo "  gcc-location: gcc-9"             >> cabal.project
++      echo "program-locations"                 >> cabal.project
++      echo "  gcc-location: gcc-9"             >> cabal.project
++    fi
    - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
    - cat cabal.project || true
    - cat cabal.project.local || true

appveyor.yml

@@ -43,7 +43,7 @@ after_test:
 deploy:
  - provider: GitHub
    auth_token:
-     secure: IbU7Tokqkdq4bI5PT+HvzG0hO4O8t2Lxq3GamSuAzWsQWt4vZahOGL9StxIXIe94
+     secure: GMhp5bcepf0KYet023puZZ/jy2r60FfyEqSCNscWKhTsa9bn27ykkNxe/+r1iAGp
    artifact: threadscope.windows.$(platform).ghc-$(GHCVER).zip
    release: $(appveyor_repo_tag_name)
    on: