Switch to new release workflow as default

.circleci/config.yml

@@ -12,19 +12,10 @@ parameters:
     default: false
     type: boolean
 
-  # Experimental unified release workflow
-  run_new_release_workflow:
-    default: false
-    type: boolean
-
   run_nightly_workflow:
     default: false
     type: boolean
 
-  release_latest:
-    default: false
-    type: boolean
-
   release_version:
     default: ""
     type: string

.circleci/configurations/jobs.yml

@@ -1076,43 +1076,10 @@ jobs:
   # -------------------------
   #      JOBS: Releases
   # -------------------------
-  prepare_package_for_release:
-    parameters:
-      version:
-        type: string
-      latest:
-        type: boolean
-        default: false
-      dryrun:
-        type: boolean
-        default: false
-    executor: reactnativeios
-    steps:
-      - checkout_code_with_cache
-      - run_yarn
-      - add_ssh_keys:
-          fingerprints:
-            - "1f:c7:61:c4:e2:ff:77:e3:cc:ca:a7:34:c2:79:e3:3c"
-      - brew_install:
-          package: cmake
-      - run:
-          name: "Set new react-native version and commit changes"
-          command: |
-            VERSION=<< parameters.version >>
-
-            if [[ -z "$VERSION" ]]; then
-              VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | head -1)
-              echo "Using the version from the package.json: $VERSION"
-            fi
-
-            node ./scripts/releases-ci/prepare-package-for-release.js -v "$VERSION" -l << parameters.latest >> --dry-run << parameters.dryrun >>
 
-  # Experimental unified release workflow
-  # Replaces `prepare_package_for_release`
-  #
   # Writes a new commit and tag(s), which will trigger the `publish_release`
   # and `publish_bumped_packages` workflows.
-  prepare_release_new:
+  prepare_release:
     parameters:
       version:
         type: string

.circleci/configurations/test_workflows/testAll.yml

@@ -4,11 +4,12 @@
         - 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_release:
+          name: "prepare_release (dry run test)"
+          version: "0.0.0"
+          monorepo_packages_version: "0.0.0"
+          tag: latest
+          dry_run: true
       - prepare_hermes_workspace
       - build_android:
           release_type: "dry-run"

.circleci/configurations/test_workflows/testAndroid.yml

@@ -4,11 +4,12 @@
           - 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_release:
+          name: "prepare_release (dry run test)"
+          version: "0.0.0"
+          monorepo_packages_version: "0.0.0"
+          tag: latest
+          dry_run: true
       - prepare_hermes_workspace
       - build_android:
           release_type: "dry-run"

.circleci/configurations/test_workflows/testIOS.yml

@@ -4,11 +4,12 @@
         - 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_release:
+          name: "prepare_release (dry run test)"
+          version: "0.0.0"
+          monorepo_packages_version: "0.0.0"
+          tag: latest
+          dry_run: true
       - prepare_hermes_workspace
       - build_android:
           release_type: "dry-run"

.circleci/configurations/top_level.yml

@@ -129,18 +129,10 @@ parameters:
     default: false
     type: boolean
 
-  run_new_release_workflow:
-    default: false
-    type: boolean
-
   run_nightly_workflow:
     default: false
     type: boolean
 
-  release_latest:
-    default: false
-    type: boolean
-
   release_version:
     default: ""
     type: string

.circleci/configurations/workflows.yml

@@ -6,7 +6,6 @@
 #  when:
 #    and:
 #      - equal: [ false, << pipeline.parameters.run_release_workflow >> ]
-#      - equal: [ false, << pipeline.parameters.run_new_release_workflow >> ]
 #      - equal: [ false, << pipeline.parameters.run_nightly_workflow >> ]
 #
 #  It's setup this way so we can trigger a release via a POST
@@ -16,22 +15,12 @@
 workflows:
   version: 2
 
-  # This workflow should only be triggered by release script
-  package_release:
+  # Release workflow, triggered by `yarn trigger-react-native-release`
+  create_release:
     when: << pipeline.parameters.run_release_workflow >>
     jobs:
-      # This job will push a tag that will trigger the publish_release workflow
-      - prepare_package_for_release:
-          name: prepare_package_for_release
-          version: << pipeline.parameters.release_version >>
-          latest : << pipeline.parameters.release_latest >>
-
-  # Experimental unified release workflow
-  create_release_new:
-    when: << pipeline.parameters.run_new_release_workflow >>
-    jobs:
-      - prepare_release_new:
-          name: prepare_release_new
+      - prepare_release:
+          name: prepare_release
           version: << pipeline.parameters.release_version >>
           monorepo_packages_version: << pipeline.parameters.release_monorepo_packages_version >>
           tag: << pipeline.parameters.release_tag >>
@@ -91,7 +80,6 @@ workflows:
     when:
       and:
         - equal: [ false, << pipeline.parameters.run_release_workflow >> ]
-        - equal: [ false, << pipeline.parameters.run_new_release_workflow >> ]
         - equal: [ false, << pipeline.parameters.run_nightly_workflow >> ]
     jobs:
       # Run lints on every commit
@@ -141,7 +129,6 @@ workflows:
     when:
       and:
         - equal: [ false, << pipeline.parameters.run_release_workflow >> ]
-        - equal: [ false, << pipeline.parameters.run_new_release_workflow >> ]
         - equal: [ false, << pipeline.parameters.run_nightly_workflow >> ]
     jobs:
       - find_and_publish_bumped_packages: