Skip to content

Commit 44fece6

Browse files
committed
Merge branch 'master' into devel
2 parents 516bdee + 52e5f4e commit 44fece6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Having said that, for robots that are being used by many users of different rese
1919

2020
## 🔲 Fast-pace local workflow
2121
Here's the outline of the workflow that aims to overcome/attenuate the users' headaches:
22-
1. The organizational fork `icub-tech-iit/robots-configuration` is deployed on the robot system instead of the upstream repository `robotology/robots-configuration`.
23-
2. We set up the machine user [`icub-tech-iit-bot`](https://github.com/icub-tech-iit-bot) on the robot system as the default committer with push access, but only locally to the repository. Push access is granted via a fine-grained PAT.
22+
1. The organizational fork `mesh-iit/robots-configuration` is deployed on the robot system instead of the upstream repository `robotology/robots-configuration`.
23+
2. We set up the machine user [`mesh-iit-bot`](https://github.com/mesh-iit-bot) on the robot system as the default committer with push access, but only locally to the repository. Push access is granted via a fine-grained PAT.
2424
3. We enforce the use of `--author="Name Surnaname <user@email.com>"` command-line option (or the corresponding env variables) at commit time so that we can trace back who did what.
25-
4. As a result, on the robot system, users will work and be able to push to the branch `icub-tech-iit/robots-configuration@devel` (actually, we will have robot-specific branches, see below). Some sort of push limitations will be enforced on this branch: e.g., no push force.
25+
4. As a result, on the robot system, users will work and be able to push to the branch `mesh-iit/robots-configuration@devel` (actually, we will have robot-specific branches, see below). Some sort of push limitations will be enforced on this branch: e.g., no push force.
2626
5. As it is paramount to enforce that at any time the configuration files allow the robot to start up flawlessly, there will be no specific automation aimed at synchronizing the upstream and the fork repositories back and forth. This process needs to be carried out under the supervision of educated humans.
2727
1. **Human-supervised update fork → upstream**. It is performed periodically (e.g., every fortnight) via PR's. On the fork, the deal is that users will push only fixes (e.g., calibration values) and minor modifications (changing the options of some services) to the "official" robot files. Of course, users are free to deal with RL-specific additions/amendments. To facilitate integration, the PR's should be merged via `Rebase and Merge` to avoid this type of [problems](https://stackoverflow.com/questions/49200667/github-squash-and-merge-subsequent-pull-request-showing-all-previous-changes).
2828
2. **Human-supervised update upstream → fork**. It is generally performed by iCub Tech developers (who keep on working upstream) when the time comes to perform tests on the robot. Once on the robot system, the developer will be using the fork, guaranteeing that the overall robot behavior won't be negatively affected by the latest modifications. Possible fixes pushed to the fork must be backed up upstream via PR's.

.github/local-workflow-tech.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ Technicalities underlying the fast-pace local workflow
1010
- Disable the option `Automatically delete head branches`.
1111

1212
## 🔲 Clone the fork locally
13-
- Clone the `icub-tech-iit` fork:
13+
- Clone the `mesh-iit` fork:
1414
```console
15-
git remote add icub-tech https://github.com/icub-tech-iit/robots-configuration.git
15+
git remote add icub-tech https://github.com/mesh-iit/robots-configuration.git
1616
```
1717
- Switch to the branch corresponding to the robot (e.g., `devel-ergoCubSN???`).
1818

1919
## 🔲 Set the default committer
2020
- In order to push to the `icub-tech` fork without password, it is necessary to get a PAT from the maintainer. Then, issue the following commands:
2121
```console
22-
git config --local user.name "icub-tech-iit-bot"
23-
git config --local user.email "icub-tech@iit.it"
22+
git config --local user.name "mesh-iit-bot"
23+
git config --local user.email "MESH@iit.it"
2424
PAT=<insert the PAT here>
25-
git remote set-url icub-tech https://x-access-token:${PAT}@github.com/icub-tech-iit/robots-configuration.git
25+
git remote set-url icub-tech https://x-access-token:${PAT}@github.com/mesh-iit/robots-configuration.git
2626
```
2727
⚠️ Note the use of the option `--local` to avoid impacting Git globally on the system.
2828
- The PAT is set to have no expiration. However, it can be revoked at any time by the maintainer.

0 commit comments

Comments
 (0)