Skip to content

Commit

Permalink
[PM-16533] Rename files to indicate they belong to Password Manager (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
KatherineInCode authored Jan 14, 2025
1 parent 75f527b commit bcaab3f
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
9 changes: 5 additions & 4 deletions Scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Scripts/update_acknowledgements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
6 changes: 3 additions & 3 deletions project.yml → project-pm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ targets:
excludes:
- "**/*Tests.*"
- "**/TestHelpers/*"
- "**/swiftgen.yml"
- "**/swiftgen-pm.yml"
- "**/GoogleService-Info.*.plist"
- "**/__Snapshots__/*"
- path: Bitwarden
Expand All @@ -194,7 +194,7 @@ targets:
buildPhase: resources
- path: README.md
buildPhase: none
- path: swiftgen.yml
- path: swiftgen-pm.yml
buildPhase: none
dependencies:
- target: AuthenticatorBridgeKit
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit bcaab3f

Please sign in to comment.