diff --git a/.github/workflows/uitests.yml b/.github/workflows/uitests.yml index bcfcf24b7..3e0e9d97c 100644 --- a/.github/workflows/uitests.yml +++ b/.github/workflows/uitests.yml @@ -6,7 +6,7 @@ on: paths: - 'Example/OpenSwiftUIUITests/**' - 'Example/setup.sh' - - 'Example/mise*.toml' + - 'mise*.toml' - '.github/workflows/uitests.yml' - '.github/actions/uitests/action.yml' workflow_dispatch: diff --git a/Example/README.md b/Example/README.md index 0ce9370ac..432643668 100644 --- a/Example/README.md +++ b/Example/README.md @@ -15,7 +15,7 @@ Run the CI setup script from the `OpenSwiftUI` repository root. It checks out th Since OpenAttributeGraph is not yet completed, you need to configure an AG backend before building. -This example defaults to Apple's private AttributeGraph framework through `mise.toml`. +This example defaults to Apple's private AttributeGraph framework through the repository's root `mise.toml`. To use Compute instead, run setup with the Compute mise environment: @@ -23,7 +23,7 @@ To use Compute instead, run setup with the Compute mise environment: ./setup.sh --compute ``` -The Compute environment is defined in `mise.compute.toml`. It disables the private AttributeGraph framework and uses `OpenSwiftUIProject/Compute` from source with `0.3.0-bugfix.1` tag. +The Compute environment is defined in the repository's root `mise.compute.toml`. It disables the private AttributeGraph framework and uses `OpenSwiftUIProject/Compute` from source with `0.3.0-bugfix.1` tag. ## Generate Project @@ -33,7 +33,7 @@ The recommended setup path is the local setup script: ./setup.sh ``` -The script trusts and installs the tools declared by `Example/mise.toml`, then runs Tuist through `mise exec` so the pinned Tuist version is used. +The script trusts and installs the tools declared by the repository's root `mise.toml`, then runs Tuist through `mise exec` so the pinned Tuist version is used. To generate the project with Compute: @@ -41,12 +41,12 @@ To generate the project with Compute: ./setup.sh --compute ``` -This uses `mise --env compute`, which loads `Example/mise.compute.toml` for `mise install`, `tuist install`, and `tuist generate`. +This uses `mise --env compute`, which loads the repository's root `mise.compute.toml` for `mise install`, `tuist install`, and `tuist generate`. To run the steps manually: ```shell -mise trust mise.toml +mise trust ../mise.toml mise install mise exec -- tuist install mise exec -- tuist generate --no-open @@ -55,7 +55,7 @@ mise exec -- tuist generate --no-open Or with Compute: ```shell -mise trust mise.compute.toml +mise trust ../mise.compute.toml mise --env compute install mise --env compute exec -- tuist install mise --env compute exec -- tuist generate --no-open diff --git a/Example/mise.toml b/Example/mise.toml deleted file mode 100644 index 781b275bf..000000000 --- a/Example/mise.toml +++ /dev/null @@ -1,6 +0,0 @@ -[tools] -tuist = "4.202.5" - -[env] -TUIST_USE_SWIFTERPM=1 -OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "1" diff --git a/Example/setup.sh b/Example/setup.sh index 50b795c53..9b265a28d 100755 --- a/Example/setup.sh +++ b/Example/setup.sh @@ -10,7 +10,7 @@ usage() { "Usage: $(basename "$0") [--compute]" \ "" \ "Options:" \ - " --compute Use mise.compute.toml while installing tools and generating the project." + " --compute Use ../mise.compute.toml while installing tools and generating the project." } run_mise() { @@ -39,9 +39,9 @@ while [[ $# -gt 0 ]]; do done cd "$SCRIPT_DIR" -mise trust "$SCRIPT_DIR/mise.toml" +mise trust "$SCRIPT_DIR/../mise.toml" if [[ ${#MISE_ARGS[@]} -gt 0 ]]; then - mise trust "$SCRIPT_DIR/mise.compute.toml" + mise trust "$SCRIPT_DIR/../mise.compute.toml" fi run_mise install run_mise exec -- tuist install diff --git a/Example/mise.compute.toml b/mise.compute.toml similarity index 100% rename from Example/mise.compute.toml rename to mise.compute.toml