[nix] revert nix watchman to use brew
AbandonedPublic
Actions

Authored by will on Jul 22 2024, 12:30 PM.

Details

Reviewers

marcin
ashoat
bartek
varun

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Summary

marcin seems to be encountering issues with nix-based watchman. This reverts using watchman with nix https://phab.comm.dev/D12777 in favor of brew

Test Plan

nix develop and brew successfully installs watchman

Diff Detail

Repository

rCOMM Comm

Branch

revert_nix_watchman

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

will created this revision.Jul 22 2024, 12:30 PM

Owners added a reviewer: Restricted Owners Package.Jul 22 2024, 12:31 PM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 22 2024, 12:31 PM

will added reviewers: ashoat, bartek, varun.Jul 22 2024, 12:35 PM

Harbormaster completed remote builds in B30580: Diff 42645.Jul 22 2024, 12:47 PM

will requested review of this revision.Jul 22 2024, 12:47 PM

Before we land this, let's see if we can solve it for @marcin some other way

This revision is now accepted and ready to land.Jul 22 2024, 1:49 PM

will abandoned this revision.Aug 6 2024, 10:31 AM

Diff no longer required. @marcin seems to have resolved his Nix watchman issues on https://linear.app/comm/issue/ENG-8886/watchman-failure-in-cd-native-andand-yarn-dev

Revision Contents
Changeset List

Path

Size

nix/

dev-shell.nix

4 lines

scripts/

install_homebrew_deps.sh

20 lines

Diff 42645

View Options

nix/dev-shell.nix

Show All 12 Lines
} from '../actions/user-actions.js';		} from '../actions/user-actions.js';
import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js';		import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js';
import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js';		import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js';
import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js';		import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js';
import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js';		import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js';		import { IdentityClientContext } from '../shared/identity-client-context.js';
import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js';		import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js';
import { relationshipActions } from '../types/relationship-types.js';		import { relationshipActions } from '../types/relationship-types.js';
import { getMessageForException } from '../utils/errors.js';		import { getMessageForException, FetchTimeout } from '../utils/errors.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';		import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js';		import { useSelector } from '../utils/redux-utils.js';
import {		import {
relyingOnAuthoritativeKeyserver,		relyingOnAuthoritativeKeyserver,
usingCommServicesAccessToken,		usingCommServicesAccessToken,
} from '../utils/services-utils.js';		} from '../utils/services-utils.js';

function UserInfosHandler(): React.Node {		function UserInfosHandler(): React.Node {
Show All 9 Lines	const userInfosWithMissingUsernames = React.useMemo(() => {
);		);
return Object.fromEntries(entriesWithoutUsernames);		return Object.fromEntries(entriesWithoutUsernames);
}, [userInfos]);		}, [userInfos]);

const dispatchActionPromise = useDispatchActionPromise();		const dispatchActionPromise = useDispatchActionPromise();
const findUserIdentities = useFindUserIdentities();		const findUserIdentities = useFindUserIdentities();

const requestedIDsRef = React.useRef(new Set<string>());		const requestedIDsRef = React.useRef(new Set<string>());
		const requestedAvatarsRef = React.useRef(new Set<string>());

const callUpdateRelationships =		const callUpdateRelationships =
useLegacyAshoatKeyserverCall(updateRelationships);		useLegacyAshoatKeyserverCall(updateRelationships);

const currentUserInfo = useSelector(state => state.currentUserInfo);		const currentUserInfo = useSelector(state => state.currentUserInfo);

const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver();		const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver();

Show All 34 Lines	void (async () => {
});		});
}		}
return { userInfos: newUserInfos };		return { userInfos: newUserInfos };
})();		})();
void dispatchActionPromise(findUserIdentitiesActionTypes, promise);		void dispatchActionPromise(findUserIdentitiesActionTypes, promise);
// 2. Fetch avatars from auth keyserver		// 2. Fetch avatars from auth keyserver
if (relyingOnAuthoritativeKeyserver) {		if (relyingOnAuthoritativeKeyserver) {
const userIDsWithoutOwnID = newUserIDs.filter(		const userIDsWithoutOwnID = newUserIDs.filter(
id => id !== currentUserInfo?.id,		id =>
		id !== currentUserInfo?.id && !requestedAvatarsRef.current.has(id),
);		);

if (userIDsWithoutOwnID.length === 0) {		if (userIDsWithoutOwnID.length === 0) {
return;		return;
}		}
void dispatchActionPromise(
updateRelationshipsActionTypes,		userIDsWithoutOwnID.forEach(id => requestedAvatarsRef.current.add(id));
callUpdateRelationships({
		const updateRelationshipsPromise = (async () => {
		try {
		return await callUpdateRelationships({
action: relationshipActions.ACKNOWLEDGE,		action: relationshipActions.ACKNOWLEDGE,
userIDs: userIDsWithoutOwnID,		userIDs: userIDsWithoutOwnID,
}),		});
		} catch (e) {
		if (e instanceof FetchTimeout) {
		userIDsWithoutOwnID.forEach(id =>
		requestedAvatarsRef.current.delete(id),
		);
		}
		throw e;
		}
		})();

		void dispatchActionPromise(
		updateRelationshipsActionTypes,
		updateRelationshipsPromise,
);		);
}		}
})();		})();
}, [		}, [
getAuthMetadata,		getAuthMetadata,
callUpdateRelationships,		callUpdateRelationships,
currentUserInfo?.id,		currentUserInfo?.id,
dispatchActionPromise,		dispatchActionPromise,
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines