Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(general): develop is the main branch #1737

Merged
merged 2 commits into from
Aug 12, 2024
Merged

refactor(general): develop is the main branch #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71267b8
refactor(general): develop is the main branch
Thoralf-M Aug 9, 2024
c5ed5cc
Merge branch 'develop' into dev-tools/main-branch-name
thibault-martinez Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cargo-llvm-cov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
steps:
- uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # Pin v4.1.1

- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v3.0.3

- name: Get iota commit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: "./.github/actions/diffs"
id: diff

# Run e2e test against localnet built on the main branch
# Run e2e test against localnet built on the develop branch
localnet:
name: Localnet
needs: diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes-monitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: self-hosted

steps:
- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/simulator-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
steps:
- uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # Pin v4.1.1

- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1

- name: Get iota commit
Expand Down
4 changes: 2 additions & 2 deletions docs/content/references/cli.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IOTA provides a command line interface (CLI) tool to interact with the IOTA netw

## Update CLI

To get the latest version of the CLI, you can run the following command from a terminal or console. Be sure to replace `<BRANCH-NAME>` with `main`, `devnet`, `testnet`, or `mainnet` to get the desired version. For more information on the branches available, see [IOTA Environment Setup](/developer/getting-started/iota-environment.mdx).
To get the latest version of the CLI, you can run the following command from a terminal or console. Be sure to replace `<BRANCH-NAME>` with `develop`, `devnet`, `testnet`, or `mainnet` to get the desired version. For more information on the branches available, see [IOTA Environment Setup](/developer/getting-started/iota-environment.mdx).

```shell
cargo install --locked --git https://github.com/iotaledger/iota.git --branch <BRANCH-NAME> --features gas-profiler iota
Expand All @@ -30,4 +30,4 @@ The six most useful commands to users are the following:
- **[IOTA Validator CLI](./cli/validator.mdx):** Use the `iota validator` command to access tools useful for IOTA validators.


Use the `help` flag for the commands that are not documented yet. For example, `iota validator --help`.
Use the `help` flag for the commands that are not documented yet. For example, `iota validator --help`.
4 changes: 2 additions & 2 deletions scripts/simtest/stress-new-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

# This script runs as part of the rust.yml CI workflow.
# It will detect new tests added to the repository since the last commit
# to the main branch, and run them 20 times each with a different seed.
# to the develop branch, and run them 20 times each with a different seed.

MERGE_BASE=$(git merge-base HEAD origin/main)
MERGE_BASE=$(git merge-base HEAD origin/develop)

# print git diff between current revision and origin/main, grep for new tests
NEW_TESTS=( $(git diff "$MERGE_BASE" \
Expand Down
Loading