Rename Mina's rampup branch to o1js-main. (#525)

o1-labs · Nov 24, 2023 · 7a0a3a0 · 7a0a3a0
1 parent 59b5b2d
commit 7a0a3a0
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/.github/actions/e2e-shared/action.yml b/.github/actions/e2e-shared/action.yml
@@ -23,7 +23,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup NodeJS ${{ inputs.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
     - name: Install Node dependencies, build and link the CLI app

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,11 +15,11 @@ jobs:
         node: [18]
     steps:
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: NPM ci, build, & test
         run: |
           npm ci
@@ -37,11 +37,11 @@ jobs:
         node: [18]
     steps:
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: NPM ci, build, & test
         run: |
           npm ci
@@ -61,11 +61,11 @@ jobs:
         node: [18]
     steps:
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: NPM ci, build, & test
         run: |
           npm ci
@@ -86,11 +86,11 @@ jobs:
         node: [18]
     steps:
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: NPM ci & build
         run: |
           npm ci

diff --git a/.github/workflows/nightly-e2e-ci-tests.yml b/.github/workflows/nightly-e2e-ci-tests.yml
@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest]
     services:
       mina-local-network:
-        image: o1labs/mina-local-network:rampup-latest-lightnet
+        image: o1labs/mina-local-network:o1js-main-latest-lightnet
         env:
           NETWORK_TYPE: 'single-node'
           PROOF_LEVEL: 'none'
@@ -38,7 +38,7 @@ jobs:
           mina-graphql-port: 8080
           max-attempts: 60
           polling-interval-ms: 10000
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use shared E2E testing steps
         uses: ./.github/actions/e2e-shared
         with:
@@ -55,7 +55,7 @@ jobs:
         node: [18, 20]
         os: [macos-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use shared E2E testing steps
         uses: ./.github/actions/e2e-shared
         with:
@@ -72,7 +72,7 @@ jobs:
         node: [18, 20]
         os: [windows-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use shared E2E testing steps
         uses: ./.github/actions/e2e-shared
         with:

diff --git a/.github/workflows/smoke-e2e-ci-tests.yml b/.github/workflows/smoke-e2e-ci-tests.yml
@@ -15,7 +15,7 @@ jobs:
         os: [ubuntu-latest]
     services:
       mina-local-network:
-        image: o1labs/mina-local-network:rampup-latest-lightnet
+        image: o1labs/mina-local-network:o1js-main-latest-lightnet
         env:
           NETWORK_TYPE: 'single-node'
           PROOF_LEVEL: 'none'
@@ -33,7 +33,7 @@ jobs:
           mina-graphql-port: 8080
           max-attempts: 60
           polling-interval-ms: 10000
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use shared E2E testing steps
         uses: ./.github/actions/e2e-shared
         with:

diff --git a/src/bin/index.js b/src/bin/index.js
@@ -160,9 +160,9 @@ yargs(hideBin(process.argv))
               string: true,
               hidden: false,
               choices: Constants.lightnetMinaBranches,
-              default: 'rampup',
+              default: 'o1js-main',
               description:
-                'One of the major Mina repository branches the artifacts were compiled against.',
+                'One of the major Mina repository branches the Docker image artifacts were compiled against.',
             },
             archive: {
               alias: 'a',

diff --git a/src/lib/constants.js b/src/lib/constants.js
@@ -7,7 +7,7 @@ import path from 'path';
  * @typedef {'single-node' | 'multi-node'} LightnetMode
  * @typedef {'fast' | 'real'} LightnetType
  * @typedef {'none' | 'full'} LightnetProofLevel
- * @typedef {'rampup' | 'berkeley' | 'develop'} LightnetMinaBranch
+ * @typedef {'o1js-main' | 'berkeley' | 'develop'} LightnetMinaBranch
  *
  * @type {{ uiTypes: UiType[], exampleTypes: ExampleType[], feePayerCacheDir: string, lightnetWorkDir: string, lightnetModes: LightnetMode[], lightnetTypes: LightnetType[], lightnetProofLevels: LightnetProofLevel[], lightnetMinaBranches: LightnetMinaBranch[] }}
  */
@@ -19,7 +19,7 @@ const Constants = Object.freeze({
   lightnetModes: ['single-node', 'multi-node'],
   lightnetTypes: ['fast', 'real'],
   lightnetProofLevels: ['none', 'full'],
-  lightnetMinaBranches: ['rampup', 'berkeley', 'develop'],
+  lightnetMinaBranches: ['o1js-main', 'berkeley', 'develop'],
 });
 
 export default Constants;
diff --git a/templates/project-ts/.github/workflows/ci.yml b/templates/project-ts/.github/workflows/ci.yml
@@ -12,11 +12,11 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: '16'
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: NPM ci, build, & test
         run: |
           npm install