From 7bbb4f9a2503f04abd371034ba1bb129d8dbce70 Mon Sep 17 00:00:00 2001
From: aleixpuig <94959119+aleixpuigb@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:42:58 +0100
Subject: [PATCH 1/2] Generate the release diff with the OAK output

Fixes issues with reaching the limit number of characters in the release notes
---
 src/ontology/uberon.Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/ontology/uberon.Makefile b/src/ontology/uberon.Makefile
index b6f7ea157f..b3f787a340 100644
--- a/src/ontology/uberon.Makefile
+++ b/src/ontology/uberon.Makefile
@@ -1412,6 +1412,7 @@ DEPLOY_GH=true
 uberon:
 	$(MAKE) prepare_release IMP=false PAT=false BRI=true CLEANFILES=tmp/merged-uberon-edit.obo
 	$(MAKE) release-diff
+	$(MAKE) release_diff_oak
 	if [ $(DEPLOY_GH) = true ]; then $(MAKE) deploy_release GHVERSION="v$(TODAY)"; fi
 
 FILTER_OUT=../patterns/definitions.owl ../patterns/pattern.owl reports/uberon-edit.obo-obo-report.tsv
@@ -1427,6 +1428,15 @@ deploy_release:
 release-diff:
 	cd diffs && make all
 
+CURRENT_BASE_RELEASE=$(ONTBASE)/uberon-base.obo
+
+.PHONY: $(TMPDIR)/current-base-release.obo
+$(TMPDIR)/current-base-release.obo:
+	wget $(CURRENT_BASE_RELEASE) -O $@
+
+release_diff_oak:
+	runoak -i simpleobo:$(TMPDIR)/current-base-release.obo diff -X simpleobo:$(RELEASEDIR)/uberon-base.obo -o $(REPORTDIR)/diff_release_oak.md --output-type md
+
 
 # ----------------------------------------
 # UTILITY COMMANDS

From 036fee0c31a12657355a3cdb3fd65b4dc5b3ff07 Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Sat, 9 Nov 2024 15:16:08 +0000
Subject: [PATCH 2/2] Move diff_release_oak target to diffs/Makefile.

Move the rule that produces the $(REPORTSDIR)/diff_release_oak.md diff
file to the dedicated diffs/Makefile, and add it to the `all` target of
that Makefile so that the new diff is automatically generated as part of
the `release-diff` target.
---
 src/ontology/diffs/Makefile  |  7 ++++++-
 src/ontology/uberon.Makefile | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/ontology/diffs/Makefile b/src/ontology/diffs/Makefile
index ea7384c6aa..c2ec344254 100644
--- a/src/ontology/diffs/Makefile
+++ b/src/ontology/diffs/Makefile
@@ -4,9 +4,10 @@ SRC = ../../../$(ONT)-base.obo
 OWLSRC = ../../../$(ONT)-base.owl
 LAST = $(OBO)/$(ONT)/$(ONT)-base.obo
 OWLLAST = $(OBO)/$(ONT)/$(ONT)-base.owl
+REPORTDIR = ../reports
 
 #all: $(ONT)-obo-diff.html $(ONT)-def-diff.html $(ONT)-lastbuild.obo $(ONT)-combined-diff.txt $(ONT)-diff.md
-all: $(ONT)-diff.md
+all: $(ONT)-diff.md $(REPORTDIR)/diff_release_oak.md
 
 $(ONT)-combined-diff.txt: $(ONT)-def-diff.html $(ONT)-obo-diff.html
 	cat $(ONT)-def-diff.txt $(ONT)-obo-diff.txt > $@
@@ -23,3 +24,7 @@ $(ONT)-diff.md: $(ONT)-lastbuild.owl $(OWLSRC)
 $(ONT)-diff.txt: $(ONT)-lastbuild.owl $(OWLSRC)
 	robot diff --labels true -f plain -l $< -r $(OWLSRC) -o $@
 
+$(REPORTDIR)/diff_release_oak.md: $(ONT)-lastbuild.obo
+	runoak -i simpleobo:$(ONT)-lastbuild.obo \
+	       diff -X simpleobo:$(SRC) \
+	            -o $@ --output-type md
diff --git a/src/ontology/uberon.Makefile b/src/ontology/uberon.Makefile
index c81d615747..bde371d720 100644
--- a/src/ontology/uberon.Makefile
+++ b/src/ontology/uberon.Makefile
@@ -1408,7 +1408,6 @@ DEPLOY_GH=true
 uberon:
 	$(MAKE) prepare_release IMP=false PAT=false BRI=true CLEANFILES=tmp/merged-uberon-edit.obo
 	$(MAKE) release-diff
-	$(MAKE) release_diff_oak
 	if [ $(DEPLOY_GH) = true ]; then $(MAKE) deploy_release GHVERSION="v$(TODAY)"; fi
 
 FILTER_OUT=../patterns/definitions.owl ../patterns/pattern.owl reports/uberon-edit.obo-obo-report.tsv
@@ -1424,15 +1423,6 @@ deploy_release:
 release-diff:
 	cd diffs && make all
 
-CURRENT_BASE_RELEASE=$(ONTBASE)/uberon-base.obo
-
-.PHONY: $(TMPDIR)/current-base-release.obo
-$(TMPDIR)/current-base-release.obo:
-	wget $(CURRENT_BASE_RELEASE) -O $@
-
-release_diff_oak:
-	runoak -i simpleobo:$(TMPDIR)/current-base-release.obo diff -X simpleobo:$(RELEASEDIR)/uberon-base.obo -o $(REPORTDIR)/diff_release_oak.md --output-type md
-
 
 # ----------------------------------------
 # UTILITY COMMANDS