Code

Config merge#982

Code

Merged

godrei merged 54 commits intomasterbitrise-io/bitrise:masterfrom config-mergebitrise-io/bitrise:config-mergeCopy head branch name to clipboardJul 26, 2024

+125,766-710

Commits

Commits on Jul 5, 2024

• Initialize modular config merge functionality

  godrei

  committed
  a503736

• Introduce repoInfos

  godrei

  committed
  67fbe65

• Check if included reference is a local reference

  godrei

  committed
  9925b34

• Handle remote config modules

  godrei

  committed
  ed443f5

• Support short commit hash in remote module reference

  godrei

  committed
  6987511

• Merge branch 'master' into config-merge

  godrei

  authored
  22c2c41

• Try ssh repo url format if http fails

  godrei

  committed
  dc89806

• Code cleanup

  godrei

  committed
  bf823a8

Commits on Jul 8, 2024

• Break configmerger dependencies

  godrei

  committed
  e6a7c99

• Test config merge

  godrei

  committed
  1467012

• Cache remote config modules

  godrei

  committed
  defc1fc

• Test remote config module cache

  godrei

  committed
  0cabe7e

Commits on Jul 9, 2024

• Adde expiration to config cache items

  godrei

  committed
  b0a495d

• Code cleanup

  godrei

  committed
  d228b05

• Remove config module cache support

  godrei

  committed
  1f42bd8

• Merge config automatically for all commands

  godrei

  committed
  3d5cbf3

• Update vendored deps and fix some e2e test

  godrei

  committed
  926d060

• Update more e2e tests

  godrei

  committed
  70b44dc

• Fix e2e tests

  godrei

  committed
  d8a0739

• Code cleanup

  godrei

  committed
  901cc11

• Validate config references

  godrei

  committed
  0d9d88f

Commits on Jul 10, 2024

• Validate module config

  godrei

  committed
  e8a54c2

• Test max include and max file count

  godrei

  committed
  d5d2b53

• Test max file size

  godrei

  committed
  9fee75f

Commits on Jul 11, 2024

• Cleanup bitrise utils

  godrei

  committed
  27f31b8

• Fix merge command usage

  godrei

  committed
  2e721fa

• Validate config modules earlier

  godrei

  committed
  1a258e1

• Code cleanup

  godrei

  committed
  9d04fc1

• Code cleanup and modular config integration tests

  godrei

  committed
  e9d0f84

• merge command writes results to file

  godrei

  committed
  e553f42

• Code cleanup

  godrei

  committed
  55c8e2d

• Fix relative module path handling when custom main config path provided

  godrei

  committed
  eec97b7

• Add integration test for merge

  godrei

  committed
  89f06fa

• Save merged configs to deploy dir

  godrei

  committed
  b964ff6

• Fix modular config tests

  godrei

  committed
  e145918

• Remove is CI condition from the auto config merge

  godrei

  committed
  35a65ee

• Relative path reference test

  godrei

  committed
  2a4d574

Commits on Jul 12, 2024

• Merge branch 'master' into config-merge

  godrei

  authored
  f21e495

• Replace FileReader with a new ConfigReader, which encapsulates more aspects of reading a config module

  godrei

  committed
  772b637

• Remove current repo info handling from config merge

  godrei

  committed
  6cb08fa

• Remove unused equalGitRepoURLs func

  godrei

  committed
  db24c8c

Commits on Jul 25, 2024

• Merge branch 'master' into config-merge

  godrei

  authored
  1e429fb

• Fix master rebase

  godrei

  committed
  33450c0

• Move new reference validation to a new function

  godrei

  committed
  4ade429

• Fix merge issue

  godrei

  committed
  ea6162d

• Config module repository caching

  godrei

  committed
  39ab124

• Cleanup repo cache and fix logging

  godrei

  committed
  2f51d87

• Code cleanup

  godrei

  committed
  9c3c7b2

• Code cleanup

  godrei

  committed
  510725e

Commits on Jul 26, 2024

• Add remote config module include e2e test case

  godrei

  committed
  09a15b2

• Remove unused depth field from config file tree

  godrei

  committed
  5d2cc06

• Introduce createDefaultMerger func

  godrei

  committed
  50e4b64

• Fail CreateBitriseConfigFromCLIParams on modular config check error

  godrei

  committed
  9f58090

• Merge repo cache into fileReader

  godrei

  committed
  8490578