From 9811238326d53951843e81ecb24ece9b307b9100 Mon Sep 17 00:00:00 2001 From: isabelrios Date: Wed, 22 Nov 2023 13:58:08 +0100 Subject: [PATCH] Refactor follow up on focus-ios changes and fix github action (#3926) * Refactor follow up fix github action * remove debug lines * update also path in github action file --- .../workflows/focus-ios-check-rust-component-dependency.yml | 2 +- .../github-actions-scripts/update-rust-component-version.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/focus-ios-check-rust-component-dependency.yml b/.github/workflows/focus-ios-check-rust-component-dependency.yml index 80cdc15b49..0cc6ab74ef 100644 --- a/.github/workflows/focus-ios-check-rust-component-dependency.yml +++ b/.github/workflows/focus-ios-check-rust-component-dependency.yml @@ -49,7 +49,7 @@ jobs: if: env.BRANCH_CREATED == 'false' run: |- git diff - git diff --quiet || (git add Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Blockzilla.xcodeproj/project.pbxproj) + git diff --quiet || (git add focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved focus-ios/Blockzilla.xcodeproj/project.pbxproj) - name: Create Pull Request uses: peter-evans/create-pull-request@v3 if: env.BRANCH_CREATED == 'false' diff --git a/focus-ios/focus-ios-tests/github-actions-scripts/update-rust-component-version.py b/focus-ios/focus-ios-tests/github-actions-scripts/update-rust-component-version.py index ab1d6b1bc4..9e35c7a014 100755 --- a/focus-ios/focus-ios-tests/github-actions-scripts/update-rust-component-version.py +++ b/focus-ios/focus-ios-tests/github-actions-scripts/update-rust-component-version.py @@ -6,8 +6,8 @@ GITHUB_REPO = "mozilla/rust-components-swift" -SPM_PACKAGE = "Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved" -BLOCKZILLA_PROJECT = "Blockzilla.xcodeproj/project.pbxproj" +SPM_PACKAGE = "focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved" +BLOCKZILLA_PROJECT = "focus-ios/Blockzilla.xcodeproj/project.pbxproj" github_access_token = os.getenv("GITHUB_TOKEN") def get_latest_rust_components_version(): @@ -113,7 +113,7 @@ def main(): update_proj_file(current_min_version, rust_component_repo_tag, BLOCKZILLA_PROJECT) # Save the newer version to be used in the PR info - f= open("focus-ios/github-actions-scripts/newest_tag.txt","w+") + f= open("focus-ios/focus-ios-tests/github-actions-scripts/newest_tag.txt","w+") f.write(rust_component_repo_tag+"\n") if __name__ == '__main__':