Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

CI: update murdock yml [backport 2022.10] #19041

Merged
merged 2 commits into from
Dec 13, 2022
Merged

CI: update murdock yml [backport 2022.10] #19041

merged 2 commits into from
Dec 13, 2022

Conversation

kaspar030
Copy link
Contributor

Backport of #19022

Contribution description

Debugging the weird "trying.tmp" / "staging.tmp" builds in #18910, I think I realize what's happening:

  1. PR changes .murdock.yml, changing the .murdock.yml to not built .tmp branches
  2. bors pushes master to .tmp (causing a build) -> murdock schedules a build
  3. bors merges the PR commits
  4. bors pushes the merged branch to .tmp

So, there's a push event that does not yet include the .murdock.yml changes, so the spurious build gets scheduled.

This PR cuts out those .murdock.yml changs commits from #18910, so that one can be built with the configuration in place.

Testing procedure

#18910

Issues/PRs references

@kaspar030 kaspar030 added Area: CI Area: Continuous Integration of RIOT components CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Dec 12, 2022
@kaspar030 kaspar030 requested review from aabadie and maribu December 12, 2022 07:41
@maribu
Copy link
Member

maribu commented Dec 12, 2022

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Configuration problem:
bors.toml: not found

@riot-ci
Copy link

riot-ci commented Dec 12, 2022

Murdock results

✔️ PASSED

74adca2 CI: use regex for branches in .murdock.yml

Success Failures Total Runtime
1 0 1 01m:20s

Artifacts

This only reflects a subset of all builds from https://ci-prod.riot-os.org. Please refer to https://ci.riot-os.org for a complete build for now.

@kaspar030
Copy link
Contributor Author

bors retry

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Configuration problem:
bors.toml: not found

@kaspar030
Copy link
Contributor Author

bors retry

@kaspar030
Copy link
Contributor Author

bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
@bors @ant9000
@maribu @kaspar030
Merge #19019 #19020 #19040 #19041
5f63863 
19019: sam0_common: use size_t len for I2C transfers (fixes #19008) [backport 2022.10] r=maribu a=maribu

# Backport of #19009

See description in #19008 . I modified `_read` and `_write` in `cpu/sam0_common/periph/i2c.c` in order to use the declared `len` parameter.

19020: makefiles/tools/gdb.inc.mk: prefer $(target)-gdb over gdb-multiarch [backport 2022.10] r=maribu a=maribu

# Backport of #18784

### Contribution description

In an ideal world everyone would just install `gdb-multiarch` and be happy. However, some MCUs need magic GDB versions sprinkled with unicorn-stardust-Espressif-patches...

Since there is little reason to have `$(target)-gdb` installed in addition to `gdb-multiarch` if `gdb-multiarch` would work fine, let's assume the user wants to use `$(target)-gdb` when present over `gdb-multiarch`.

### Testing procedure

```
USEMODULE=esp_jtag make BOARD=esp32-ethernet-kit-v1_2 PROGRAMMER=openocd OPENOCD=openocd-esp32 debug -C examples/default
```

In `master`:

```
/home/maribu/Repos/software/RIOT/dist/tools/openocd/openocd.sh debug /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf
### Starting Debugging ###
Open On-Chip Debugger v0.11.0-snapshot (2022-10-21-10:40)
Licensed under GNU GPL v2
For bug reports, read
	http://openocd.org/doc/doxygen/bugs.html
Reading symbols from /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf...
Remote debugging using :3333
Remote 'g' packet reply is too long (expected 180 bytes, got 420 bytes): 00040040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000004004096fec51c2500060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
```

With this PR:

```
/home/maribu/Repos/software/RIOT/dist/tools/openocd/openocd.sh debug /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf
### Starting Debugging ###
DBG="xtensa-esp32-elf-gdb", GDB="xtensa-esp32-elf-gdb", DBG_FLAGS="-q -ex "tar ext :3333" "
Open On-Chip Debugger v0.11.0-snapshot (2022-10-21-10:40)
Licensed under GNU GPL v2
For bug reports, read
	http://openocd.org/doc/doxygen/bugs.html
Reading symbols from /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf...
Remote debugging using :3333
0x40000400 in ?? ()
(gdb) start
The program being debugged has been started already.
Start it from the beginning? (y or n) y
Temporary breakpoint 1 at 0x400d0024: file /data/riotbuild/riotbase/examples/default/main.c, line 37.
Note: automatically using hardware breakpoints for read-only addresses.
Starting program: /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf 
[esp32.cpu0] Target halted, PC=0x400D0024, debug_reason=00000001
Set GDB target to 'esp32.cpu0'

Temporary breakpoint 1, main () at /data/riotbuild/riotbase/examples/default/main.c:37
37	{
(gdb) show arch
The target architecture is set to "auto" (currently "xtensa").
(gdb) 

quit
A debugging session is active.

	Inferior 1 [Remote target] will be detached.

Quit anyway? (y or n) y

Detaching from program: /home/maribu/Repos/software/RIOT/examples/default/bin/esp32-ethernet-kit-v1_2/default.elf, Remote target
[Inferior 1 (Remote target) detached]
```

### Issues/PRs references

#18359 (comment)

19040: CI: add bors.toml from master r=kaspar030 a=kaspar030



19041: CI: update murdock yml [backport 2022.10] r=kaspar030 a=kaspar030

# Backport of #19022



Co-authored-by: Antonio Galea <antonio.galea@gmail.com>
Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>
@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Build failed (retrying...):

bors bot added a commit that referenced this pull request Dec 12, 2022
@bors @kaspar030
Merge #19040 #19041
55856b1 
19040: CI: copy bors configuration from master r=kaspar030 a=kaspar030



19041: CI: update murdock yml [backport 2022.10] r=kaspar030 a=kaspar030

# Backport of #19022



Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>
@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Build failed (retrying...):

@maribu
Copy link
Member

maribu commented Dec 12, 2022

bors retry

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Already running a review

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Configuration problem:
bors.toml: not found

@kaspar030
Copy link
Contributor Author

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 13, 2022

Build succeeded:

@bors bors bot merged commit e6fcd15 into RIOT-OS:2022.10-branch Dec 13, 2022
@kaspar030 kaspar030 deleted the backport/2022.10/update_murdock_yml branch December 13, 2022 07:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@maribu maribu maribu approved these changes

@aabadie aabadie Awaiting requested review from aabadie

Assignees
No one assigned
Labels
Area: CI Area: Continuous Integration of RIOT components CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Process: release backport Integration Process: The PR is a release backport of a change previously provided to master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaspar030 @maribu @riot-ci