diff --git a/.circleci/config.yml b/.circleci/config.yml index 46b7c1d42ac8ab..acc8e429afe286 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1752,6 +1752,11 @@ workflows: - equal: [ false, << pipeline.parameters.run_release_workflow >> ] - equal: [ false, << pipeline.parameters.run_nightly_workflow >> ] jobs: + - prepare_package_for_release: + name: prepare_package_for_release + version: '' + latest : false + dryrun: true - prepare_hermes_workspace - test_ios_rntester_hermes_xcode_integration - build_hermesc_linux: @@ -1939,40 +1944,6 @@ workflows: - build_hermes_macos - build_hermesc_windows - package_and_publish_release_dryrun: - when: - and: - - equal: [ false, << pipeline.parameters.run_release_workflow >> ] - - equal: [ false, << pipeline.parameters.run_nightly_workflow >> ] - jobs: - - prepare_package_for_release: - name: prepare_package_for_release - version: '' - latest : false - dryrun: true - - prepare_hermes_workspace: - requires: - - prepare_package_for_release - - build_hermesc_linux: - requires: - - prepare_hermes_workspace - - build_hermes_macos: - requires: - - prepare_hermes_workspace - matrix: - parameters: - flavor: ["Debug", "Release"] - - build_hermesc_windows: - requires: - - prepare_hermes_workspace - - build_npm_package: - name: build_and_publish_npm_package - release_type: "dry-run" - requires: - - build_hermesc_linux - - build_hermes_macos - - build_hermesc_windows - analysis: when: and: diff --git a/scripts/circle-ci-artifacts-utils.js b/scripts/circle-ci-artifacts-utils.js index 3a9d9d2a0c83f1..5d7f9e2b09bf8b 100644 --- a/scripts/circle-ci-artifacts-utils.js +++ b/scripts/circle-ci-artifacts-utils.js @@ -26,16 +26,8 @@ async function initialize(circleCIToken, baseTempPath, branchName) { baseTemporaryPath = baseTempPath; exec(`mkdir -p ${baseTemporaryPath}`); const pipeline = await _getLastCircleCIPipelineID(branchName); - const packageAndReleaseWorkflow = await _getPackageAndReleaseWorkflow( - pipeline.id, - ); const testsWorkflow = await _getTestsWorkflow(pipeline.id); - const jobsPromises = [ - _getCircleCIJobs(packageAndReleaseWorkflow.id), - _getCircleCIJobs(testsWorkflow.id), - ]; - - const jobsResults = await Promise.all(jobsPromises); + const jobsResults = await _getCircleCIJobs(testsWorkflow.id); jobs = jobsResults.flatMap(j => j); } @@ -96,10 +88,6 @@ function _throwIfWorkflowNotFound(workflow, name) { } } -async function _getPackageAndReleaseWorkflow(pipelineId) { - return _getSpecificWorkflow(pipelineId, 'package_and_publish_release_dryrun'); -} - async function _getTestsWorkflow(pipelineId) { return _getSpecificWorkflow(pipelineId, 'tests'); } @@ -165,7 +153,7 @@ async function artifactURLHermesDebug() { } async function artifactURLForMavenLocal() { - return _findUrlForJob('build_and_publish_npm_package-2', 'maven-local.zip'); + return _findUrlForJob('build_npm_package', 'maven-local.zip'); } async function artifactURLForHermesRNTesterAPK(emulatorArch) {