[AINFRA-1539] [Internal] Migrate from configure_apply to git-conceal
#4841
+131
−121
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Generated by 🚫 Danger |
AliSoftware
force-pushed
the
AINFRA-1539-adopt-git-conceal
branch
from
ee73e6d to
dab694d
Compare
…rated to git-conceal)
- Updated a8c-ci-toolkit to version 6.0.0 in shared-pipeline-vars - Replaced all configure_apply calls with git-conceal-unlock - Moved secrets unlocking step before gem installation in all scripts - Updated all shell scripts and YAML pipeline files
AliSoftware
force-pushed
the
AINFRA-1539-adopt-git-conceal
branch
from
dab694d to
f84cda4
Compare
AliSoftware
added
[Type] Tooling
This was referenced Dec 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This updates the way this repository manages secret files needed for compilation (
secret.properties,sentry.properties, etc) from being managed viaconfigure_applyto being managed bygit-concealinstead.See paaHJt-96q-p2 more details about this migration.
Closes AINFRA-1539
Merge Timing
While this PR can be reviewed and tested already, I don't plan to merge it until January so that I can be around to help with any issues or questions that may arise with the new tool and new process.
Testing Instructions
Note
While not strictly necessary, in order to not risk messing up your everyday working copy while going through those testing instructions, I'd recommend running those steps in a separate fresh clone of the repository instead of in the working copy you usually work with.
secret.propertiessentry.propertiesapp/google-services.jsonautomotive/google-services.jsonwear/google-services.jsongoogle-upload-credentials.jsonfirebase.secrets.jsonrelease.keystore.propertiesfiles being encrypted and thus ignored{app,automotive,wear}/google-services.jsonfiles were all present but encrypted (and thus not valid JSON), how does that impact flows like Google Login in the app? And thus how would this behave for external contributors to this project?README.mdto unlock the repo by copying the decryption key from the Secret Store and runningpbpaste | base64 -d | git conceal unlock -secret.properties,sentry.properties, …) are now read and their properties used during compilationgoogle-services.json?) work as expected in the compiled appNote on CI failure
The CI failure on "Merged Manifest Diff" is expected, because the way this job works is that it switches to this PR's base branch to generate the base manifest and compare it with the one generated from this PR's head… but when it switches to this PR's branch, that base branch (
main) doesn't havegit-concealset up—as it is still relying onconfigure_applyinstead—so it doesn't have thegoogle-services.jsonfile present inmainduring that dance.I expect this to be a transient issue, i.e. once this PR is merged into
mainand other PRs start to rebase on top so that all branches start to usegit-conceal, this internal dance that "Merged Manifest Diff" does should work again.