1
1
mirror of https://github.com/github/semantic.git synced 2024-12-26 08:25:19 +03:00

Merge branch 'master' into docker-hub

* master:
  Always write the GHC environment files.
  I was working on the wrong branch, smh
  Use source-repository-package to pin Git deps in cabal.
This commit is contained in:
Douglas Creager 2019-06-05 10:24:18 -04:00
commit c46ed1dc87
6 changed files with 16 additions and 15 deletions

9
.gitmodules vendored
View File

@ -1,12 +1,3 @@
[submodule "vendor/hspec-expectations-pretty-diff"]
path = vendor/hspec-expectations-pretty-diff
url = https://github.com/rewinfrey/hspec-expectations-pretty-diff
[submodule "vendor/haskell-tree-sitter"] [submodule "vendor/haskell-tree-sitter"]
path = vendor/haskell-tree-sitter path = vendor/haskell-tree-sitter
url = https://github.com/tree-sitter/haskell-tree-sitter.git url = https://github.com/tree-sitter/haskell-tree-sitter.git
[submodule "vendor/proto3-suite"]
path = vendor/proto3-suite
url = https://github.com/joshvera/proto3-suite.git
[submodule "vendor/proto3-wire"]
path = vendor/proto3-wire
url = https://github.com/joshvera/proto3-wire.git

View File

@ -29,7 +29,7 @@ before_install:
install: install:
- cabal new-update - cabal new-update
- cabal new-configure --enable-tests --write-ghc-environment-files=always - cabal new-configure --write-ghc-environment-files=always
- cabal new-build --only-dependencies -j - cabal new-build --only-dependencies -j
script: script:

View File

@ -1,3 +1,16 @@
packages: vendor/* vendor/proto3-suite vendor/haskell-tree-sitter/languages/* semantic.cabal semantic-core/semantic-core.cabal packages: vendor/* vendor/haskell-tree-sitter/languages/* . semantic-core
package proto3-suite source-repository-package
type: git
location: https://github.com/joshvera/proto3-suite.git
tag: e13c7099789867733f42f47a25349a826937d870
source-repository-package
type: git
location: https://github.com/joshvera/proto3-wire.git
tag: 84664e22f01beb67870368f1f88ada5d0ad01f56
source-repository-package
type: git
location: https://github.com/rewinfrey/hspec-expectations-pretty-diff
tag: 94af5871c24ba319f7f72fefa53c1a4d074c9a29

@ -1 +0,0 @@
Subproject commit 94af5871c24ba319f7f72fefa53c1a4d074c9a29

1
vendor/proto3-suite vendored

@ -1 +0,0 @@
Subproject commit 83f3352f0c7c94ea091e6087f60692eda9991fae

1
vendor/proto3-wire vendored

@ -1 +0,0 @@
Subproject commit 84664e22f01beb67870368f1f88ada5d0ad01f56