diff --git a/.buildkite/android.yml b/.buildkite/android.yml --- a/.buildkite/android.yml +++ b/.buildkite/android.yml @@ -6,7 +6,7 @@ - 'rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android' - 'apt update && apt install -y autoconf libtool build-essential cmake git libgtest-dev libssl-dev zlib1g-dev' - 'scripts/install_protobuf.sh' - - 'yarn cleaninstall --frozen-lockfile --skip-optional' + - 'yarn ci-cleaninstall' - 'cd native/android' - './gradlew clean && ./gradlew bundleRelease --no-daemon "-Dorg.gradle.jvmargs=-Xmx32g -XX:MaxPermSize=32g -XX:+HeapDumpOnOutOfMemoryError"' retry: diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml --- a/.buildkite/eslint_flow_jest.yml +++ b/.buildkite/eslint_flow_jest.yml @@ -1,6 +1,6 @@ steps: - label: ':eslint: :jest: ESLint & Flow & Jest' - command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . /root/.cargo/env && apt update && apt install -y cmake && yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000 && yarn eslint --max-warnings=0 && yarn flow-all && yarn jest-all' + command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . /root/.cargo/env && apt update && apt install -y cmake && yarn ci-cleaninstall && yarn eslint --max-warnings=0 && yarn flow-all && yarn jest-all' retry: automatic: true plugins: diff --git a/.buildkite/ios.yml b/.buildkite/ios.yml --- a/.buildkite/ios.yml +++ b/.buildkite/ios.yml @@ -4,7 +4,7 @@ - 'pod repo update && yarn workspace native clean-ios' - 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y' - 'source /Users/comm/.cargo/env' - - 'yarn cleaninstall --frozen-lockfile --skip-optional' + - 'yarn ci-cleaninstall' - 'cd native/ios && xcodebuild -workspace Comm.xcworkspace -scheme Comm -destination generic/platform=iOS -allowProvisioningUpdates' retry: automatic: true diff --git a/.buildkite/jsi_codegen.yml b/.buildkite/jsi_codegen.yml --- a/.buildkite/jsi_codegen.yml +++ b/.buildkite/jsi_codegen.yml @@ -5,7 +5,7 @@ - 'apt update && apt install -y cmake' - 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y' - '. /root/.cargo/env' - - 'yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000' + - 'yarn ci-cleaninstall' - 'cd native && yarn codegen-jsi && git diff --exit-code' retry: automatic: true diff --git a/.buildkite/macos.yml b/.buildkite/macos.yml --- a/.buildkite/macos.yml +++ b/.buildkite/macos.yml @@ -1,7 +1,7 @@ steps: - label: ':macos: macOS Build' command: - - 'yarn cleaninstall --frozen-lockfile --skip-optional' + - 'yarn ci-cleaninstall' - 'cd desktop && yarn make-dev --arch universal' agents: - 'mac=true' diff --git a/.buildkite/nix_yarn.yml b/.buildkite/nix_yarn.yml --- a/.buildkite/nix_yarn.yml +++ b/.buildkite/nix_yarn.yml @@ -1,6 +1,6 @@ steps: - - label: 'nix develop -c yarn cleaninstall --network-timeout 180000' - command: 'nix develop --accept-flake-config -c yarn cleaninstall --network-timeout 180000' + - label: 'nix develop -c yarn ci-cleaninstall' + command: 'nix develop --accept-flake-config -c yarn ci-cleaninstall' retry: automatic: true agents: diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -33,8 +33,8 @@ - name: Install Yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save ANDROID_KEY_STORE_B64 to file env: diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml --- a/.github/workflows/android_release.yml +++ b/.github/workflows/android_release.yml @@ -26,8 +26,8 @@ - name: Install Yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save ALCHEMY_API_KEY to file working-directory: ./native diff --git a/.github/workflows/eslint_flow_jest.yml b/.github/workflows/eslint_flow_jest.yml --- a/.github/workflows/eslint_flow_jest.yml +++ b/.github/workflows/eslint_flow_jest.yml @@ -19,8 +19,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: yarn eslint --max-warnings=0 run: yarn eslint --max-warnings=0 diff --git a/.github/workflows/ios_ci.yml b/.github/workflows/ios_ci.yml --- a/.github/workflows/ios_ci.yml +++ b/.github/workflows/ios_ci.yml @@ -47,8 +47,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save auth_key to file working-directory: ./native/ios diff --git a/.github/workflows/ios_release.yml b/.github/workflows/ios_release.yml --- a/.github/workflows/ios_release.yml +++ b/.github/workflows/ios_release.yml @@ -41,8 +41,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save ALCHEMY_API_KEY to file working-directory: ./native diff --git a/.github/workflows/ios_xctest.yml b/.github/workflows/ios_xctest.yml --- a/.github/workflows/ios_xctest.yml +++ b/.github/workflows/ios_xctest.yml @@ -47,8 +47,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save auth_key to file working-directory: ./native/ios diff --git a/.github/workflows/jsi_codegen.yml b/.github/workflows/jsi_codegen.yml --- a/.github/workflows/jsi_codegen.yml +++ b/.github/workflows/jsi_codegen.yml @@ -19,8 +19,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: '[native] JSI Codegen' working-directory: ./native diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml --- a/.github/workflows/macos_ci.yml +++ b/.github/workflows/macos_ci.yml @@ -48,8 +48,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Build App env: diff --git a/.github/workflows/remove_harbormaster_tags.yml b/.github/workflows/remove_harbormaster_tags.yml --- a/.github/workflows/remove_harbormaster_tags.yml +++ b/.github/workflows/remove_harbormaster_tags.yml @@ -18,8 +18,8 @@ - name: npm install -g yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Generate tag removal script working-directory: ./scripts diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml --- a/.github/workflows/windows_ci.yml +++ b/.github/workflows/windows_ci.yml @@ -21,8 +21,8 @@ - name: Install Yarn run: npm install -g yarn - - name: yarn --frozen-lockfile --network-timeout 180000 - run: yarn --frozen-lockfile --network-timeout 180000 + - name: yarn ci-cleaninstall + run: yarn ci-cleaninstall - name: Save WINDOWS_CERTIFICATE_B64 to file env: diff --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "scripts": { "clean": "yarn workspace lib clean && yarn workspace web clean && yarn workspace native clean && yarn workspace keyserver clean && yarn workspace landing clean && yarn workspace desktop clean && yarn workspace rust-node-addon clean && yarn workspace electron-update-server clean && rm -rf node_modules/", "cleaninstall": "(killall flow || pkill flow || true) && yarn clean && yarn", + "ci-cleaninstall": "yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000", "eslint": "eslint .", "eslint:fix": "eslint --fix .", "clang-format-all": "eval `node scripts/get_clang_paths_cli.js` | xargs clang-format -i",