Page MenuHomePhabricator
Differential D6785

[native] Fix Buildkite iOS build to work from inside Nix
ClosedPublic
Actions

Authored by ashoat on Feb 20 2023, 10:47 AM.
Tags
None
Referenced Files
F5122325: D6785.id22737.diff
Thu, Apr 3, 1:17 PM
F5122324: D6785.id22736.diff
Thu, Apr 3, 1:17 PM
F5120259: D6785.id22733.diff
Thu, Apr 3, 7:27 AM
Unknown Object (File)
Wed, Apr 2, 4:08 PM
Unknown Object (File)
Wed, Apr 2, 4:08 PM
Unknown Object (File)
Wed, Apr 2, 4:08 PM
Unknown Object (File)
Thu, Mar 20, 5:06 AM
Unknown Object (File)
Tue, Mar 18, 12:32 AM
View All Files
Subscribers
tomek

Details

Reviewers
atul
• jon
Commits
rCOMM4adee5e8f27e: [native] Fix Buildkite iOS build to work from inside Nix
Summary

We need the same patch we use in native/package.json for yarn react-native and yarn expo.

Test Plan

Let's see if this diff's Buildkite build succeeds :)

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Feb 20 2023, 10:47 AM
Herald added a subscriber: tomek. · View Herald TranscriptFeb 20 2023, 10:47 AM
atul published this revision for review.Feb 20 2023, 10:50 AM
Harbormaster failed remote builds in B16625: Diff 22733!Feb 20 2023, 10:50 AM
ashoat updated this revision to Diff 22735.Feb 20 2023, 11:19 AM

Move $PATH hack to package.json. I suspect Buildkite is doing something wonky

Harbormaster failed remote builds in B16627: Diff 22735!Feb 20 2023, 11:31 AM
ashoat updated this revision to Diff 22736.Feb 20 2023, 11:35 AM

Seeing this issue because macOS's cp command is in /bin, and so we end up using the GNU one instead

This revision updates us to prefix $PATH with not just /usr/bin, but also /bin, so that we have access to BSD cp

ashoat updated this revision to Diff 22737.Feb 20 2023, 11:45 AM

It worked! Adding /bin to all of the places we prefix /usr/bin for future-proofing

Harbormaster completed remote builds in B16628: Diff 22736.Feb 20 2023, 11:47 AM
ashoat mentioned this in D6783: Update Prettier.Feb 20 2023, 11:47 AM
ashoat mentioned this in D6784: [keyserver] Fix rust-node-addon after deprecation of --experimental-specifier-resolution=node.
ashoat added a child revision: D6783: Update Prettier.Feb 20 2023, 11:47 AM
• jon accepted this revision.Feb 20 2023, 11:53 AM
This revision is now accepted and ready to land.Feb 20 2023, 11:53 AM
Harbormaster completed remote builds in B16629: Diff 22737.Feb 20 2023, 12:00 PM
atul accepted this revision.Feb 20 2023, 12:05 PM
Closed by commit rCOMM4adee5e8f27e: [native] Fix Buildkite iOS build to work from inside Nix (authored by ashoat). · Explain WhyFeb 20 2023, 12:25 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM4adee5e8f27e: [native] Fix Buildkite iOS build to work from inside Nix.

Revision Contents
Changeset List

PathSize
.buildkite/
2 lines
native/
5 lines
2 lines

Diff 22740

View Options

.buildkite/ios.yml

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesimport type {
EventSubscription, EventSubscription,
KeyboardEvent, KeyboardEvent,
} from '../types/react-native.js'; } from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js'; import type { ImageStyle } from '../types/styles.js';
import { import {
runTiming, runTiming,
ratchetAlongWithKeyboardHeight, ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js'; } from '../utils/animation-utils.js';
import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import { import {
type StateContainer, type StateContainer,
type StateChange, type StateChange,
setStateForContainer, setStateForContainer,
} from '../utils/state-container.js'; } from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js'; import EthereumLogo from '../vectors/ethereum-logo.react.js';
let initialAppLoad = true; let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Linestype Props = {
+cookie: ?string, +cookie: ?string,
+urlPrefix: string, +urlPrefix: string,
+loggedIn: boolean, +loggedIn: boolean,
+dimensions: DerivedDimensionsInfo, +dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle, +splashStyle: ImageStyle,
+styles: typeof unboundStyles, +styles: typeof unboundStyles,
// Redux dispatch functions // Redux dispatch functions
+dispatch: Dispatch, +dispatch: Dispatch,
// Keyserver olm sessions functions
+initialNotificationsEncryptedMessage: () => Promise<string>,
}; };
type State = { type State = {
+mode: LoggedOutMode, +mode: LoggedOutMode,
+nextMode: LoggedOutMode, +nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>, +logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>, +registerState: StateContainer<RegisterState>,
}; };
class LoggedOutModal extends React.PureComponent<Props, State> { class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines if (!__DEV__) {
const actionSource = loggedIn const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie ? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux; : logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials( const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch, dispatch,
cookie, cookie,
urlPrefix, urlPrefix,
actionSource, actionSource,
this.props.initialNotificationsEncryptedMessage,
); );
if ( if (
sessionChange && sessionChange &&
sessionChange.cookie && sessionChange.cookie &&
sessionChange.cookie.startsWith('user=') sessionChange.cookie.startsWith('user=')
) { ) {
// success! we can expect subsequent actions to fix up the state // success! we can expect subsequent actions to fix up the state
return; return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie); const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix); const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn); const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector); const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector); const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const callInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage();
return ( return (
<LoggedOutModal <LoggedOutModal
{...props} {...props}
isForeground={isForeground} isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded} persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded} rehydrateConcluded={rehydrateConcluded}
cookie={cookie} cookie={cookie}
urlPrefix={urlPrefix} urlPrefix={urlPrefix}
loggedIn={loggedIn} loggedIn={loggedIn}
dimensions={dimensions} dimensions={dimensions}
splashStyle={splashStyle} splashStyle={splashStyle}
styles={styles} styles={styles}
dispatch={dispatch} dispatch={dispatch}
initialNotificationsEncryptedMessage={
callInitialNotificationsEncryptedMessage
}
/> />
); );
}); });
export default ConnectedLoggedOutModal; export default ConnectedLoggedOutModal;
View Options

native/package.json

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesimport type {
EventSubscription, EventSubscription,
KeyboardEvent, KeyboardEvent,
} from '../types/react-native.js'; } from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js'; import type { ImageStyle } from '../types/styles.js';
import { import {
runTiming, runTiming,
ratchetAlongWithKeyboardHeight, ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js'; } from '../utils/animation-utils.js';
import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import { import {
type StateContainer, type StateContainer,
type StateChange, type StateChange,
setStateForContainer, setStateForContainer,
} from '../utils/state-container.js'; } from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js'; import EthereumLogo from '../vectors/ethereum-logo.react.js';
let initialAppLoad = true; let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Linestype Props = {
+cookie: ?string, +cookie: ?string,
+urlPrefix: string, +urlPrefix: string,
+loggedIn: boolean, +loggedIn: boolean,
+dimensions: DerivedDimensionsInfo, +dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle, +splashStyle: ImageStyle,
+styles: typeof unboundStyles, +styles: typeof unboundStyles,
// Redux dispatch functions // Redux dispatch functions
+dispatch: Dispatch, +dispatch: Dispatch,
// Keyserver olm sessions functions
+initialNotificationsEncryptedMessage: () => Promise<string>,
}; };
type State = { type State = {
+mode: LoggedOutMode, +mode: LoggedOutMode,
+nextMode: LoggedOutMode, +nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>, +logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>, +registerState: StateContainer<RegisterState>,
}; };
class LoggedOutModal extends React.PureComponent<Props, State> { class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines if (!__DEV__) {
const actionSource = loggedIn const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie ? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux; : logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials( const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch, dispatch,
cookie, cookie,
urlPrefix, urlPrefix,
actionSource, actionSource,
this.props.initialNotificationsEncryptedMessage,
); );
if ( if (
sessionChange && sessionChange &&
sessionChange.cookie && sessionChange.cookie &&
sessionChange.cookie.startsWith('user=') sessionChange.cookie.startsWith('user=')
) { ) {
// success! we can expect subsequent actions to fix up the state // success! we can expect subsequent actions to fix up the state
return; return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie); const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix); const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn); const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector); const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector); const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const callInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage();
return ( return (
<LoggedOutModal <LoggedOutModal
{...props} {...props}
isForeground={isForeground} isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded} persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded} rehydrateConcluded={rehydrateConcluded}
cookie={cookie} cookie={cookie}
urlPrefix={urlPrefix} urlPrefix={urlPrefix}
loggedIn={loggedIn} loggedIn={loggedIn}
dimensions={dimensions} dimensions={dimensions}
splashStyle={splashStyle} splashStyle={splashStyle}
styles={styles} styles={styles}
dispatch={dispatch} dispatch={dispatch}
initialNotificationsEncryptedMessage={
callInitialNotificationsEncryptedMessage
}
/> />
); );
}); });
export default ConnectedLoggedOutModal; export default ConnectedLoggedOutModal;
View Options

postinstall.sh

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesimport type {
EventSubscription, EventSubscription,
KeyboardEvent, KeyboardEvent,
} from '../types/react-native.js'; } from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js'; import type { ImageStyle } from '../types/styles.js';
import { import {
runTiming, runTiming,
ratchetAlongWithKeyboardHeight, ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js'; } from '../utils/animation-utils.js';
import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import { import {
type StateContainer, type StateContainer,
type StateChange, type StateChange,
setStateForContainer, setStateForContainer,
} from '../utils/state-container.js'; } from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js'; import EthereumLogo from '../vectors/ethereum-logo.react.js';
let initialAppLoad = true; let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Linestype Props = {
+cookie: ?string, +cookie: ?string,
+urlPrefix: string, +urlPrefix: string,
+loggedIn: boolean, +loggedIn: boolean,
+dimensions: DerivedDimensionsInfo, +dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle, +splashStyle: ImageStyle,
+styles: typeof unboundStyles, +styles: typeof unboundStyles,
// Redux dispatch functions // Redux dispatch functions
+dispatch: Dispatch, +dispatch: Dispatch,
// Keyserver olm sessions functions
+initialNotificationsEncryptedMessage: () => Promise<string>,
}; };
type State = { type State = {
+mode: LoggedOutMode, +mode: LoggedOutMode,
+nextMode: LoggedOutMode, +nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>, +logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>, +registerState: StateContainer<RegisterState>,
}; };
class LoggedOutModal extends React.PureComponent<Props, State> { class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines if (!__DEV__) {
const actionSource = loggedIn const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie ? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux; : logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials( const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch, dispatch,
cookie, cookie,
urlPrefix, urlPrefix,
actionSource, actionSource,
this.props.initialNotificationsEncryptedMessage,
); );
if ( if (
sessionChange && sessionChange &&
sessionChange.cookie && sessionChange.cookie &&
sessionChange.cookie.startsWith('user=') sessionChange.cookie.startsWith('user=')
) { ) {
// success! we can expect subsequent actions to fix up the state // success! we can expect subsequent actions to fix up the state
return; return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie); const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix); const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn); const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector); const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector); const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const callInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage();
return ( return (
<LoggedOutModal <LoggedOutModal
{...props} {...props}
isForeground={isForeground} isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded} persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded} rehydrateConcluded={rehydrateConcluded}
cookie={cookie} cookie={cookie}
urlPrefix={urlPrefix} urlPrefix={urlPrefix}
loggedIn={loggedIn} loggedIn={loggedIn}
dimensions={dimensions} dimensions={dimensions}
splashStyle={splashStyle} splashStyle={splashStyle}
styles={styles} styles={styles}
dispatch={dispatch} dispatch={dispatch}
initialNotificationsEncryptedMessage={
callInitialNotificationsEncryptedMessage
}
/> />
); );
}); });
export default ConnectedLoggedOutModal; export default ConnectedLoggedOutModal;