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

CI: copy bors configuration from master #19040

Merged
merged 2 commits into from
Dec 12, 2022

Conversation

kaspar030
Copy link
Contributor

@kaspar030 kaspar030 commented Dec 12, 2022

Contribution description

This will allow merging PRs again.

Just copies the file from master using git checkout master -- bors.toml.

edit Also cherry-picks the workflow change that enables the static tests that bors waits for, for the release branch.

Testing procedure

Issues/PRs references

@kaspar030 kaspar030 requested a review from maribu December 12, 2022 07:31
@kaspar030 kaspar030 added 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 labels Dec 12, 2022
@riot-ci
Copy link

riot-ci commented Dec 12, 2022

Murdock results

✔️ PASSED

80f518a CI: make static-tests and tools-build workflows run on bors branches

Success Failures Total Runtime
1 0 1 52s

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.

@maribu
Copy link
Member

maribu commented Dec 12, 2022

bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
19040: CI: add bors.toml from master r=maribu a=kaspar030



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

bors bot commented Dec 12, 2022

Build failed:

@kaspar030
Copy link
Contributor Author

bors priority=1
bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
19040: CI: add bors.toml from master r=kaspar030 a=kaspar030



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

bors bot commented Dec 12, 2022

Build failed:

@kaspar030
Copy link
Contributor Author

"alle guten Dinge sind drei"

bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
19040: CI: add bors.toml from master r=kaspar030 a=kaspar030



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

bors bot commented Dec 12, 2022

Build failed:

@kaspar030
Copy link
Contributor Author

bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
19040: CI: add bors.toml from master r=kaspar030 a=kaspar030



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

maribu commented Dec 12, 2022

bors ping

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

pong

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Canceled.

@github-actions github-actions bot added the Area: CI Area: Continuous Integration of RIOT components label Dec 12, 2022
@kaspar030
Copy link
Contributor Author

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@kaspar030
Copy link
Contributor Author

ok, this was stalled on static-tests and tools-test. The release branch was missing the commit that enables those for staging. :/
I've added it here.

@kaspar030
Copy link
Contributor Author

bors merge

bors bot added a commit that referenced this pull request Dec 12, 2022
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>
@kaspar030 kaspar030 changed the title CI: add bors.toml from master CI: copy bors configuration from master Dec 12, 2022
@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
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

The static tests failed due to a codespell update. It seems we need to backport d9cde14 for it to pass

@maribu
Copy link
Member

maribu commented Dec 12, 2022

#19044 is the backport needed to let statics tests passing. If we would get the addition of bors.toml, the update of the murdock.yml and the fix of the typos into the same merge train, the build should succeed...

@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 bot added a commit that referenced this pull request Dec 12, 2022
19040: CI: copy bors configuration from master r=kaspar030 a=kaspar030



19044: treewide: fix typos found by recent codespell [backport 2022.10] r=maribu a=maribu

# Backport of #18966

### Contribution description

Static tests are currently failing on master.

### Testing procedure

Green static tests.

### Issues/PRs references



Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>
Co-authored-by: Juergen Fitschen <me@jue.yt>
@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

This PR was included in a batch that successfully built, but then failed to merge into 2022.10-branch. It will not be retried.

Additional information:

{"message":"You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-branches/ for more information.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@kaspar030
Copy link
Contributor Author

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 12, 2022

Build succeeded:

@bors bors bot merged commit 94316b7 into RIOT-OS:2022.10-branch Dec 12, 2022
@kaspar030 kaspar030 deleted the bors.toml_for_release_branch branch December 12, 2022 23:17
# for free to join this conversation on GitHub. Already have an account? # to comment
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants