Page MenuHomePhabricator
Differential D12883

[web] Fixes the emscripten CI build by allowing curl redirects
ClosedPublic
Actions

Authored by will on Jul 25 2024, 10:24 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 1:01 PM
Unknown Object (File)
Thu, Apr 17, 7:49 AM
Unknown Object (File)
Thu, Apr 17, 1:15 AM
Unknown Object (File)
Wed, Apr 16, 8:33 PM
Unknown Object (File)
Wed, Apr 16, 10:01 AM
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Mar 13 2025, 7:02 PM
Unknown Object (File)
Mar 5 2025, 3:10 PM
View All 62 Files
Subscribers
ashoat

Details

Reviewers
varun
marcin
inka
tomek
Commits
rCOMM6b04b56d9534: [web] Fixes the emscripten CI build by allowing curl redirects
Summary

Our emscripten builds are failing as curl https://www.openssl.org/source/openssl-3.2.0.tar.gz --output openssl-file results in an empty file.

The link seems to redirect to the proper .tar.gz openssl archive file, so we need to allow curl to redirect with the -L flag

Test Plan

ran the script and succeeeds without invalid archive error message

Diff Detail

Repository
rCOMM Comm
Branch
fix_emscripten_curl
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
web/
scripts/
2 lines

Diff 42782

View Options

web/scripts/run_emscripten.sh

// @flow // @flow
import reduceKeyserverStore from './keyserver-reducer.js'; import reduceKeyserverStore from './keyserver-reducer.js';
import { deleteKeyserverAccountActionTypes } from '../actions/user-actions.js'; import { deleteKeyserverAccountActionTypes } from '../actions/user-actions.js';
import { import { defaultKeyserverInfo } from '../types/keyserver-types.js';
defaultKeyserverInfo,
type KeyserverStore,
} from '../types/keyserver-types.js';
import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
jest.mock('../utils/config.js'); jest.mock('../utils/config.js');
describe('reduceKeyserverStore', () => { describe('reduceKeyserverStore', () => {
it('removes from the store keyservers the user has disconnected from', () => { it('removes from the store keyservers the user has disconnected from', () => {
const oldKeyserverStore = { const oldKeyserverStore = {
keyserverInfos: { keyserverInfos: {
Show All 25 Lines it('removes from the store keyservers the user has disconnected from', () => {
expect( expect(
reduceKeyserverStore(oldKeyserverStore, deleteAccountAction) reduceKeyserverStore(oldKeyserverStore, deleteAccountAction)
.keyserverStore, .keyserverStore,
).toEqual({ keyserverInfos: { ['0']: defaultKeyserverInfo('url1') } }); ).toEqual({ keyserverInfos: { ['0']: defaultKeyserverInfo('url1') } });
}); });
it('update keyserverInfo with authoritativeKeyserverID', () => { it('update keyserverInfo with authoritativeKeyserverID', () => {
const defaultAshoatKeyserverInfo = defaultKeyserverInfo('url1'); const defaultAshoatKeyserverInfo = defaultKeyserverInfo('url1');
const oldKeyserverStore: KeyserverStore = ({ const oldKeyserverStore = {
keyserverInfos: { keyserverInfos: {
[authoritativeKeyserverID()]: { [authoritativeKeyserverID()]: {
...defaultAshoatKeyserverInfo, ...defaultAshoatKeyserverInfo,
connection: { connection: {
...defaultAshoatKeyserverInfo.connection, ...defaultAshoatKeyserverInfo.connection,
connectionIssue: 'blah', connectionIssue: 'client_version_unsupported',
}, },
}, },
}, },
}: any); };
const deleteAccountAction = { const deleteAccountAction = {
type: deleteKeyserverAccountActionTypes.success, type: deleteKeyserverAccountActionTypes.success,
payload: { payload: {
currentUserInfo: { anonymous: true }, currentUserInfo: { anonymous: true },
preRequestUserState: { preRequestUserState: {
cookiesAndSessions: {}, cookiesAndSessions: {},
currentUserInfo: { currentUserInfo: {
Show All 14 Lines expect(
reduceKeyserverStore(oldKeyserverStore, deleteAccountAction) reduceKeyserverStore(oldKeyserverStore, deleteAccountAction)
.keyserverStore.keyserverInfos[authoritativeKeyserverID()].connection .keyserverStore.keyserverInfos[authoritativeKeyserverID()].connection
.connectionIssue, .connectionIssue,
).toEqual(null); ).toEqual(null);
}); });
it('return the same keyserverInfo with authoritativeKeyserverID()', () => { it('return the same keyserverInfo with authoritativeKeyserverID()', () => {
const defaultAshoatKeyserverInfo = defaultKeyserverInfo('url1'); const defaultAshoatKeyserverInfo = defaultKeyserverInfo('url1');
const oldKeyserverStore: KeyserverStore = ({ const oldKeyserverStore = {
keyserverInfos: { keyserverInfos: {
[authoritativeKeyserverID()]: { [authoritativeKeyserverID()]: {
...defaultAshoatKeyserverInfo, ...defaultAshoatKeyserverInfo,
connection: { connection: {
...defaultAshoatKeyserverInfo.connection, ...defaultAshoatKeyserverInfo.connection,
connectionIssue: 'blah', connectionIssue: 'client_version_unsupported',
}, },
}, },
}, },
}: any); };
const deleteAccountAction = { const deleteAccountAction = {
type: deleteKeyserverAccountActionTypes.success, type: deleteKeyserverAccountActionTypes.success,
payload: { payload: {
currentUserInfo: { anonymous: true }, currentUserInfo: { anonymous: true },
preRequestUserState: { preRequestUserState: {
cookiesAndSessions: {}, cookiesAndSessions: {},
currentUserInfo: { currentUserInfo: {
Show All 9 Lines const deleteAccountAction = {
customKeyName: undefined, customKeyName: undefined,
}, },
}; };
expect( expect(
reduceKeyserverStore(oldKeyserverStore, deleteAccountAction) reduceKeyserverStore(oldKeyserverStore, deleteAccountAction)
.keyserverStore.keyserverInfos[authoritativeKeyserverID()].connection .keyserverStore.keyserverInfos[authoritativeKeyserverID()].connection
.connectionIssue, .connectionIssue,
).toEqual('blah'); ).toEqual('client_version_unsupported');
}); });
}); });