Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down Expand Up @@ -99,6 +100,7 @@ jobs:
- name: Install ICU4C (Linux)
if: matrix.os == 'ubuntu-latest'
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down Expand Up @@ -170,6 +172,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down Expand Up @@ -201,6 +204,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down Expand Up @@ -237,6 +241,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down Expand Up @@ -318,6 +323,7 @@ jobs:

- name: Install ICU4C (Linux)
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cross-version-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:

- name: Install ICU4C
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
sudo apt-get update
sudo apt-get install -y libicu-dev

Expand Down
11 changes: 4 additions & 7 deletions cmd/bd/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -510,13 +510,10 @@ func executeSyncAction(ctx context.Context, plan BootstrapPlan, cfg *configfile.
// existing files intact (createConfigYaml skips if config.yaml exists; the
// metadata.json write is a full rewrite that preserves caller fields).
func finalizeSyncedBootstrap(beadsDir, syncRemote string, cfg *configfile.Config, dbName string) error {
// Start from the caller's cfg (which may be DefaultConfig when
// metadata.json was absent, or a parent workspace config propagated by
// findParentConfig). Preserve whatever upstream fields were already set,
// then fill in the bits required by configfile.Load consumers.
if cfg == nil {
cfg = configfile.DefaultConfig()
}
// Preserve whatever upstream fields were already set in cfg (which may
// be DefaultConfig when metadata.json was absent, or a parent workspace
// config propagated by findParentConfig), then fill in the bits
// required by configfile.Load consumers.
cfg.Backend = configfile.BackendDolt
cfg.DoltDatabase = dbName
if isEmbeddedMode() {
Expand Down
Loading