Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some build fixes (changed sq API, and a missing file on iOS) #5896

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Some build fixes (changed sq API, and a missing file on iOS) #5896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2825ed7
build: Update tools/checkout-keystore for modern `sq`
chrisbobbe Sep 30, 2024
1db6467
ios build: `yarn build` on node_modules/react-native/react-native-cod…
chrisbobbe Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/checkout-keystore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ filter_sq_stderr() {
grep -vE '^(Compressed|Encrypted) '
}

sq decrypt --recipient-key "${recipient_key}" \
-o "${cleartext}" "${cryptotext}" \
sq decrypt --recipient-file "${recipient_key}" \
Copy link
Member

@gnprice gnprice Sep 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

The Sequoia CLI's changelog doesn't seem to mention these changes:
  https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/b4158f40dea64655cf7357d3c8f220e8bd1708d9/NEWS

But they're easy enough to adapt to; shrug.

Looks like this was here:
https://gitlab.com/sequoia-pgp/sequoia/-/commit/db90178d5b61e3310f979fdaefc66610adf0d33e
https://gitlab.com/sequoia-pgp/sequoia/-/issues/933

Happened a couple of years ago; guess I hadn't updated my sq install either. (But I have now, and it has the new names.)

--output "${cleartext}" "${cryptotext}" \
2> >(filter_sq_stderr >&2)

wait_min=15
Expand Down
13 changes: 13 additions & 0 deletions tools/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ patch_package() {
node_modules/.bin/patch-package
}

# Since we take react-native from Git, some packages that ship with it
# and are used in the build need their build scripts run.
build_rn_packages() {
(
cd node_modules/react-native/packages/react-native-codegen/
# A copy of the package's `yarn build` script
# with a `--verbose` flag removed.
yarn clean && node scripts/build.js
)
}

pod_install() {
[[ "$OSTYPE" == "darwin"* ]] \
|| return 0
Expand All @@ -31,6 +42,8 @@ jetify() {

patch_package

build_rn_packages

pod_install

jetify
Expand Down
Loading