diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 128f9c0e3..3d8686a4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -355,8 +355,8 @@ jobs: - name: Update build version and number run: | - yq -i '.settings.MARKETING_VERSION = "${{ steps.version_info.outputs.version_name }}"' 'project.yml' - yq -i '.settings.CURRENT_PROJECT_VERSION = "${{ steps.version_info.outputs.version_number }}"' 'project.yml' + yq -i '.settings.MARKETING_VERSION = "${{ steps.version_info.outputs.version_name }}"' 'project-pm.yml' + yq -i '.settings.CURRENT_PROJECT_VERSION = "${{ steps.version_info.outputs.version_number }}"' 'project-pm.yml' - name: Update CI build info run: | diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 951c9c1cc..1f416fc58 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -41,7 +41,7 @@ jobs: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} with: - config: crowdin.yml + config: crowdin-pm.yml upload_sources: false upload_translations: false download_translations: true diff --git a/.github/workflows/crowdin-push.yml b/.github/workflows/crowdin-push.yml index d983a9b91..336431549 100644 --- a/.github/workflows/crowdin-push.yml +++ b/.github/workflows/crowdin-push.yml @@ -34,6 +34,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} with: - config: crowdin.yml + config: crowdin-pm.yml upload_sources: true upload_translations: false diff --git a/.license_plist.yml b/.license-plist-pm.yml similarity index 100% rename from .license_plist.yml rename to .license-plist-pm.yml diff --git a/README.md b/README.md index ba507e015..512809bcf 100644 --- a/README.md +++ b/README.md @@ -140,4 +140,4 @@ This project's structure is split into separate sections to support sharing as m ### GlobalTestHelpers -`GlobalTestHelpers` is a directory that contains helper files used in all test targets. This directory is included in each target that is defined in the `project.yml` file. +`GlobalTestHelpers` is a directory that contains helper files used in all test targets. This directory is included in each target that is defined in the `project-pm.yml` file. diff --git a/Scripts/bootstrap.sh b/Scripts/bootstrap.sh index 2bdc5b34c..87980765a 100755 --- a/Scripts/bootstrap.sh +++ b/Scripts/bootstrap.sh @@ -4,13 +4,14 @@ set -euo pipefail mint bootstrap -mint run xcodegen xcodegen +# Handle script being called from repo root or Scripts folder +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +repo_root=$(dirname "$script_dir") + +mint run xcodegen --spec "$repo_root/project-pm.yml" echo "✅ Bootstrapped!" # Check Xcode version matches .xcode-version -# handle script being called from repo root or Scripts folder -script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -repo_root=$(dirname "$script_dir") xcode_version_file="$repo_root/.xcode-version" if [ ! -f "$xcode_version_file" ]; then diff --git a/Scripts/update_acknowledgements.sh b/Scripts/update_acknowledgements.sh index 873895543..008e3481f 100755 --- a/Scripts/update_acknowledgements.sh +++ b/Scripts/update_acknowledgements.sh @@ -11,5 +11,5 @@ if [ "$CONFIGURATION" = "Debug" ]; then fi mint run LicensePlist license-plist \ - --config-path .license_plist.yml + --config-path .license-plist-pm.yml fi diff --git a/crowdin.yml b/crowdin-pm.yml similarity index 100% rename from crowdin.yml rename to crowdin-pm.yml diff --git a/project.yml b/project-pm.yml similarity index 99% rename from project.yml rename to project-pm.yml index 8e55f696e..86a2babde 100644 --- a/project.yml +++ b/project-pm.yml @@ -182,7 +182,7 @@ targets: excludes: - "**/*Tests.*" - "**/TestHelpers/*" - - "**/swiftgen.yml" + - "**/swiftgen-pm.yml" - "**/GoogleService-Info.*.plist" - "**/__Snapshots__/*" - path: Bitwarden @@ -194,7 +194,7 @@ targets: buildPhase: resources - path: README.md buildPhase: none - - path: swiftgen.yml + - path: swiftgen-pm.yml buildPhase: none dependencies: - target: AuthenticatorBridgeKit @@ -409,7 +409,7 @@ targets: if [[ ! "$PATH" =~ "/opt/homebrew/bin" ]]; then PATH="/opt/homebrew/bin:$PATH" fi - mint run swiftgen config run --config "swiftgen.yml" + mint run swiftgen config run --config "swiftgen-pm.yml" basedOnDependencyAnalysis: false outputFiles: - $(SRCROOT)/BitwardenShared/UI/Platform/Application/Support/Generated/Assets.swift diff --git a/swiftgen.yml b/swiftgen-pm.yml similarity index 100% rename from swiftgen.yml rename to swiftgen-pm.yml