Merge remote-tracking branch 'upstream/stable' into merge

Fork: 0

johnpearcey / dub_jkp

Browse code Merge remote-tracking branch 'upstream/stable' into merge_stable master
commit 161fa2590b8e8f67fb8efcf0c9956a1443d2c3f6 2 parents dd6a693 + 34172f7 Martin Nowak authored on 6 Apr 2018

Patch

Unified Split

Showing 16 changed files

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          .travis.yml
       env: [FRONTEND=2.068]
    - d: gdc-4.8.5
      env: [FRONTEND=2.068]
    - stage: deploy
      d: dmd
      d: ldc
      os: osx
      script: echo "Deploying to GitHub releases ..." && ./release.sh
      deploy:
        - provider: releases
          skip_cleanup: true
          api_key: $GH_REPO_TOKEN
          on:
            tags: true
    - d: dmd
      # DMD 32-bit is needed for 32-bit compilation
      script: echo "Deploying to GitHub releases ..." && DMD=$(find $HOME/dlang | grep "dmd-.*/linux/bin32/dmd") ./release.sh
    - d: ldc
      script: echo "Deploying to GitHub releases ..." && ./release.sh
      env: [ARCH=32]
      addons:
        apt:
          packages:
          skip_cleanup: true
          api_key: $GH_REPO_TOKEN
          on:
            tags: true
    - d: dmd
    - d: ldc
      script: echo "Deploying to GitHub releases ..." && ./release.sh
      deploy:
        - provider: releases
          file_glob: true
       env: [FRONTEND=2.068]
     - d: gdc-4.8.5
       env: [FRONTEND=2.068]
     - stage: deploy
+      d: dmd
+      d: ldc
       os: osx
       script: echo "Deploying to GitHub releases ..." && ./release.sh
       deploy:
         - provider: releases
           skip_cleanup: true
           api_key: $GH_REPO_TOKEN
           on:
             tags: true
+    - d: dmd
+      # DMD 32-bit is needed for 32-bit compilation
+      script: echo "Deploying to GitHub releases ..." && DMD=$(find $HOME/dlang | grep "dmd-.*/linux/bin32/dmd") ./release.sh
+    - d: ldc
+      script: echo "Deploying to GitHub releases ..." && ./release.sh
       env: [ARCH=32]
       addons:
         apt:
           packages:
           skip_cleanup: true
           api_key: $GH_REPO_TOKEN
           on:
             tags: true
+    - d: dmd
+    - d: ldc
       script: echo "Deploying to GitHub releases ..." && ./release.sh
       deploy:
         - provider: releases
           file_glob: true

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          CHANGELOG.md
               Changelog
=========
 
v1.8.1 - 2018-
-------------------
 
- Fixed a regression in 1.8.0 that caused linker files specified as `sourceFiles` to not get inherited properly - [issue #1408][issue1408], [pull #1409][issue1409]
- Fixed a regression in 1.8.0 that caused `mainSourceFile` to be passed twice to the compiler on Windows - [issue #1407][issue1407], [pull #1410][issue1410]
 
[issue1407]: https://github.com/dlang/dub/issues/1407
[issue1408]: https://github.com/dlang/dub/issues/1408
[issue1409]: https://github.com/dlang/dub/issues/1409
[issue1410]: https://github.com/dlang/dub/issues/1410
 
 
v1.8.0 - 2018-03-01
-------------------
 Changelog
 =========
+v1.8.1 - 2018-
+-------------------
+- Fixed a regression in 1.8.0 that caused linker files specified as `sourceFiles` to not get inherited properly - [issue #1408][issue1408], [pull #1409][issue1409]
+- Fixed a regression in 1.8.0 that caused `mainSourceFile` to be passed twice to the compiler on Windows - [issue #1407][issue1407], [pull #1410][issue1410]
+[issue1407]: https://github.com/dlang/dub/issues/1407
+[issue1408]: https://github.com/dlang/dub/issues/1408
+[issue1409]: https://github.com/dlang/dub/issues/1409
+[issue1410]: https://github.com/dlang/dub/issues/1410
 v1.8.0 - 2018-03-01
 -------------------

Ignore Space Show notes View appveyor.yml

Ignore Space Show notes View release.sh

Ignore Space Show notes View source/dub/generators/generator.d

Ignore Space Show notes View source/dub/recipe/packagerecipe.d

Ignore Space Show notes View source/dub/version_.d

Ignore Space Show notes View test/fetchzip.sh

Ignore Space Show notes View test/issue1408-inherit-linker-files/.no_run 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/.no_test 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/dep.d 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/dub.sdl 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/lib.d 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/lib/dub.sdl 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/lib/lib.d 0 → 100644

Ignore Space Show notes View test/issue1408-inherit-linker-files/main.d 0 → 100644

Show line notes below