Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor EXP-3953 [v121] Move nimbus-fml.sh to application-services #16969

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Refactor EXP-3953 [v121] Move nimbus-fml.sh to application-services #16969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7608778
Remove nimbus-fml.sh in favour of bootstrapped from AS copy
jhugman Oct 23, 2023
8b462d8
Remove .experimenter.yaml
jhugman Oct 23, 2023
801a97f
Add feature metadata for messaging feature
jhugman Oct 23, 2023
4ca9cba
Trigger FML generate on every build
jhugman Oct 23, 2023
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
236 changes: 0 additions & 236 deletions .experimenter.yaml
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,8 @@ nimbus-fml/
*config.py

# tmp files
/test-fixtures/tmp/*
/test-fixtures/tmp/*

# Nimbus build artifacts.
bin/nimbus-fml-configuration.local.sh
bin/nimbus-fml.sh
6 changes: 3 additions & 3 deletions Client.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11953,14 +11953,14 @@
};
5FA2232C27F6FA69005B3D87 /* Nimbus Feature Manifest Generator Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 12;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(SRCROOT)/nimbus.fml.yaml",
"$(SRCROOT)/bin/nimbus-fml.sh",
"$(SOURCE_ROOT)/nimbus.fml.yaml",
);
name = "Nimbus Feature Manifest Generator Script";
outputFileListPaths = (
Expand All @@ -11970,7 +11970,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ $ACTION != \"indexbuild\" ]; then\n bash $PWD/bin/nimbus-fml.sh --verbose\nfi\n";
shellScript = "if [ $ACTION != \"indexbuild\" ]; then\n bash $SOURCE_ROOT/bin/nimbus-fml.sh --verbose\nfi\n";
};
871F34442AD0A291006E34EE /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
2 changes: 1 addition & 1 deletion bin/nimbus-fml-configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fml_file=nimbus.fml.yaml
## Set the list of directories to scan for *.fml.yaml files.
## This can have individual files, but are relative to SOURCE_ROOT
## Default: $PROJECT
export MODULES=$fml_file
export MODULES="$PROJECT $fml_file"

## Set the directory where the generated files are placed.
## This is relative to SOURCE_ROOT.
Expand Down
Loading
Loading