Skip to content

Commit 3c8a2d6

Browse files
committed
Avoid building local packages twice
1 parent c71fcd2 commit 3c8a2d6

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

.github/scripts/common.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ build_with_cache() {
121121
ecabal configure "$@"
122122
ecabal build --dependencies-only "$@" --dry-run
123123
nonfatal sync_from
124-
ecabal build --dependencies-only "$@" || nonfatal sync_to
125-
nonfatal sync_to
126124
ecabal build "$@"
127125
nonfatal sync_to
128126
}

GNUmakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ hls-ghc:
9797
$(CABAL) $(CABAL_BASE_ARGS) configure --project-file="$(PROJECT_FILE)" -w "ghc-$(GHC_VERSION)" $(CABAL_ARGS) exe:haskell-language-server exe:haskell-language-server-wrapper
9898
$(CABAL) $(CABAL_BASE_ARGS) build --project-file="$(PROJECT_FILE)" -w "ghc-$(GHC_VERSION)" $(CABAL_ARGS) --dependencies-only --dry-run exe:haskell-language-server exe:haskell-language-server-wrapper
9999
$(call sync_from)
100-
$(CABAL) $(CABAL_BASE_ARGS) build --project-file="$(PROJECT_FILE)" -w "ghc-$(GHC_VERSION)" $(CABAL_ARGS) --dependencies-only exe:haskell-language-server exe:haskell-language-server-wrapper
101100
$(CP) dist-newstyle/cache/plan.json "$(ROOT_DIR)/out/plan.json/$(ARTIFACT)-ghc-$(GHC_VERSION)-plan.json"
102-
$(call sync_to)
103101
$(CABAL_INSTALL) --project-file="$(PROJECT_FILE)" -w "ghc-$(GHC_VERSION)" $(CABAL_ARGS) $(CABAL_INSTALL_ARGS) --installdir="$(ROOT_DIR)/out/$(ARTIFACT)/$(GHC_VERSION)" exe:haskell-language-server exe:haskell-language-server-wrapper
104102
$(call sync_to)
105103
$(STRIP_S) "$(ROOT_DIR)/out/$(ARTIFACT)/$(GHC_VERSION)/haskell-language-server"

0 commit comments

Comments
 (0)