[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/libomemo][debian/master] 2 commits: CI: disable aptly

[Evangelos Ribeiro Tzaras]

Evangelos Ribeiro Tzaras pushed to branch debian/master at Debian On Mobile / libomemo


Commits:
88ebe790 by Evangelos Ribeiro Tzaras at 2021-01-15T10:17:45+01:00
CI: disable aptly

- - - - -
3d7d1c10 by Evangelos Ribeiro Tzaras at 2021-01-15T11:57:42+01:00
d/patches: Unbreak parallel builds

- - - - -


3 changed files:

- + debian/patches/0001-Makefile-Fix-possible-race-condition-in-test-targets.patch
- + debian/patches/series
- debian/salsa-ci.yml


Changes:

=====================================
debian/patches/0001-Makefile-Fix-possible-race-condition-in-test-targets.patch
=====================================
@@ -0,0 +1,41 @@
+From b1dca640465132d06b0d0c801b4a870908832533 Mon Sep 17 00:00:00 2001
+From: Evangelos Ribeiro Tzaras <devrtz at fortysixandtwo.eu>
+Date: Thu, 14 Jan 2021 16:41:15 +0100
+Subject: [PATCH] Makefile: Fix possible race condition in test* targets
+
+When running the build in parallel moving '*.g*'
+may fail because files got moved by another build job
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5a6b080..6819861 100644
+--- a/Makefile
++++ b/Makefile
+@@ -118,19 +118,19 @@ install: $(BDIR)
+ test_libomemo: $(TDIR)/test_libomemo.c $(SDIR)/libomemo.c
+ 	$(CC) $(COVFLAGS) $<  $(FILES) -o $(TDIR)/$@.o $(TESTFLAGS)
+ 	-$(TDIR)/$@.o
+-	mv *.g* $(TDIR)
++	find .  -maxdepth 1 -iname 'test*.g*' -exec mv {} $(TDIR) \;
+ 
+ .PHONY: test_crypto
+ test_crypto: $(TDIR)/test_crypto.c $(SDIR)/libomemo_crypto.c
+ 	$(CC) $(COVFLAGS) $<  $(FILES) -o $(TDIR)/$@.o $(TESTFLAGS)
+ 	-$(TDIR)/$@.o
+-	mv *.g* $(TDIR)
++	find .  -maxdepth 1 -iname 'test*.g*' -exec mv {} $(TDIR) \;
+ 
+ .PHONY: test_storage
+ test_storage: $(TDIR)/test_storage.c $(SDIR)/libomemo_storage.c
+ 	$(CC) $(COVFLAGS) $< $(FILES) -o $(TDIR)/$@.o $(TESTFLAGS)
+ 	-$(TDIR)/$@.o
+-	mv *.g* $(TDIR)
++	find .  -maxdepth 1 -iname 'test*.g*' -exec mv {} $(TDIR) \;
+ 
+ .PHONY: test
+ test : test_libomemo test_crypto test_storage
+-- 
+2.29.2
+


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Makefile-Fix-possible-race-condition-in-test-targets.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -5,4 +5,3 @@ include:
 
 variables:
   SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1
-  SALSA_CI_DISABLE_APTLY: 0



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libomemo/-/compare/e22dccca62bda92f7e1734e336072a53bf712ae4...3d7d1c106023d32db0c2737ec8bbbddbe1b9ddf2

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libomemo/-/compare/e22dccca62bda92f7e1734e336072a53bf712ae4...3d7d1c106023d32db0c2737ec8bbbddbe1b9ddf2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20210115/6a656195/attachment-0001.html>