Bug #16044

devel branch FTBFS with ublock 1.17

Added by CyrilBrulebois 2018-10-12 10:33:31 . Updated 2019-01-30 11:49:27 .

Status:
Resolved
Priority:
High
Assignee:
Category:
Build system
Target version:
Tails_3.12
Start date:
2018-10-12
Due date:
% Done:

100%

Feature Branch:
bugfix/16044-refresh-ublock-origin-context+force-all-tests
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

While working on the feature/buster branch, I’ve noticed that devel FTBFSes because of the recent uploads of ublock 1.17 to sid:

Checking for .orig files
E: Some patches are fuzzy and leave .orig files around:
/sbin/start-stop-daemon.orig
/usr/share/webext/ublock-origin/js/background.js.orig
E: config/chroot_local-hooks/99-zzz_check-for-dot-orig-files failed (exit non-zero). You should check for errors.

This should be fixed by the attached patch, which I’m currently testing on top of my feature/buster branch.

Files

0001-Refresh-context-for-ublock-patch.patch (1506 B) CyrilBrulebois, 2018-10-12 10:32:37

Subtasks

Related issues

Related to Tails - Bug #16036: devel branch FTBFS since systemd 239-7~bpo9+1 was uploaded Resolved 2018-10-10
Blocks Tails - Feature #15506: Core work 2018Q4: Foundations Team Resolved 2018-04-08

History

#1 Updated by intrigeri 2018-10-12 10:38:15

  • Category set to Build system
  • Assignee set to intrigeri
  • Priority changed from Normal to High
  • Target version set to Tails_3.10.1

#2 Updated by intrigeri 2018-10-12 10:38:30

#3 Updated by intrigeri 2018-10-12 10:38:49

  • Assignee changed from intrigeri to CyrilBrulebois

(Didn’t notice you were working on it already.)

#4 Updated by intrigeri 2018-10-12 10:41:53

  • related to Bug #16036: devel branch FTBFS since systemd 239-7~bpo9+1 was uploaded added

#5 Updated by segfault 2018-10-14 11:44:11

  • Feature Branch set to bugfix/16044-refresh-udisks-context

I created a branch with your patch. I will now test if I can successfully build a branch with both the fixes for this and Bug #16036.

#6 Updated by segfault 2018-10-14 11:45:51

  • Feature Branch changed from bugfix/16044-refresh-udisks-context to bugfix/16044-refresh-ublock-origin-context

Whoops, set a wrong branch name

#7 Updated by segfault 2018-10-14 13:08:36

> I will now test if I can successfully build a branch with both the fixes for this and Bug #16036.

The built completed

#8 Updated by intrigeri 2018-10-15 09:09:39

  • Assignee changed from CyrilBrulebois to intrigeri
  • % Done changed from 0 to 10
  • QA Check set to Ready for QA
  • Feature Branch changed from bugfix/16044-refresh-ublock-origin-context to bugfix/16044-refresh-ublock-origin-context+force-all-tests

Thank you both!

I’ve appended +force-all-tests to the branch name so we get useful Jenkins results (most Tor Browser tests are tagged fragile). kibi has no Jenkins access yet so I’ll monitor the test suite results.

Someone (be it segfault, kibi or me, whoever claims it first) should test that uBlock works fine in the resulting ISO.

#9 Updated by intrigeri 2018-10-15 20:07:26

  • % Done changed from 10 to 60

A couple test failures on Jenkins are probably unrelated but deserve closer investigation. OTOH it can’t be worse than no devel ISO at all and without the fuzzy patch, we would have taken this upgrade without even noticing, so I’m going to merge this (but keep this ticket open for further checks). On the failure screenshots I see the uBlock icon but I still want to verify it works fine.

#10 Updated by intrigeri 2018-10-16 10:44:05

  • Status changed from In Progress to Fix committed
  • Assignee deleted (intrigeri)
  • Target version changed from Tails_3.10.1 to Tails_3.12
  • % Done changed from 60 to 100
  • QA Check changed from Ready for QA to Pass

intrigeri wrote:
> On the failure screenshots I see the uBlock icon but I still want to verify it works fine.

It does.

#11 Updated by anonym 2019-01-30 11:49:27

  • Status changed from Fix committed to Resolved