search

tue-robotics / tue-env

Package manager that can be used to install (ROS) dependencies
BSD 3-Clause "New" or "Revised" License
10 stars 6 forks source link

Use multiple branches in CI to fix PR to another feature branch #641

Closed MatthijsBurgh closed 1 year ago

MatthijsBurgh commented 1 year ago

Review and merge after #563

Fixes #591 Fixes #643

Do not merge: Remove --debug

Test run of PR to another feature branch: https://github.com/tue-robotics/rgbd/actions/runs/4092072454/jobs/7065877146 Test run of PR to default branch: https://github.com/tue-robotics/rgbd/actions/runs/4097481327/jobs/7065889606

ar13pit commented 1 year ago

Only approving the changes of this PR, not of the base branch :)

MatthijsBurgh commented 1 year ago

Switching back to default branch behaviour:

[tue-env-targets] Updating targets... From https://github.com/tue-robotics/tue-env-targets
 - [deleted]         (none)     -> origin/blaat
Your configuration specifies to merge with the ref 'refs/heads/blaat'
from the remote, but no such ref was fetched.
[tue-env-targets] Current branch 'blaat' isn't available anymore, switching to the default branch
Switched to branch 'master'
Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Branch 'master' set up to track remote branch 'master' from 'origin'.
Updating ab78d04..efd6b39
Fast-forward
 .github/workflows/main.yml | 26 +++++++++++++++++++++-----
 README.md                  |  5 +++++
 libboost-dev/install.yaml  |  2 ++
 ros/install.bash           |  4 +++-
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 README.md
 create mode 100644 libboost-dev/install.yaml
Synchronizing submodule url for 'hsr-setup'
Cloning into '/home/docker/ros/noetic/.env/targets/hsr-setup'...
Host key verification failed.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
fatal: clone of 'git@github.com:tue-robotics/hsr-setup.git' into submodule path '/home/docker/ros/noetic/.env/targets/hsr-setup' failed
Failed to clone 'hsr-setup'. Retry scheduled
Cloning into '/home/docker/ros/noetic/.env/targets/hsr-setup'...
Host key verification failed.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
fatal: clone of 'git@github.com:tue-robotics/hsr-setup.git' into submodule path '/home/docker/ros/noetic/.env/targets/hsr-setup' failed
Failed to clone 'hsr-setup' a second time, aborting
[tue-env-targets] Switched to the default branch, 'master'
[tue-env-targets] Trying to switch to branch 'PULLREQUEST'...
[tue-env-targets] Branch 'PULLREQUEST' does not exist. Current branch is 'master'
[tue-env-targets] Trying to switch to branch 'blaat'...
[tue-env-targets] Branch 'blaat' does not exist. Current branch is 'master'

(I manually forced master to be behind)