From 0885dcd731113ff1a96b26e34feeef74924b530d Mon Sep 17 00:00:00 2001
From: Niels V <niels.vandekeybus@redpencil.io>
Date: Wed, 1 Mar 2023 20:54:07 +0100
Subject: [PATCH 1/2] bump virtuoso to 7.2.9

---
 .woodpecker/.feature.yml |  2 +-
 Dockerfile               | 10 ++--------
 README.md                |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.woodpecker/.feature.yml b/.woodpecker/.feature.yml
index a210855..12f5bcd 100644
--- a/.woodpecker/.feature.yml
+++ b/.woodpecker/.feature.yml
@@ -4,7 +4,7 @@ pipeline:
     secrets: [ docker_username, docker_password ]
     settings:
       repo: redpencil/virtuoso
-      tags: ${CI_COMMIT_SOURCE_BRANCH} # strips v from the tag
+      tags: ${CI_COMMIT_SOURCE_BRANCH/\//-}
     when:
       event:
         - push
diff --git a/Dockerfile b/Dockerfile
index 975f33a..55a9cc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04 as builder
 
-# Set Virtuoso commit SHA to Virtuoso 7.2.8 release (2022-10-19)
-ARG VIRTUOSO_COMMIT=64e6ecd39b03383875b7f2f15ed8070e2ebcd1f0
+# Set Virtuoso commit SHA to Virtuoso 7.2.9 release (2023-02-27)
+ARG VIRTUOSO_COMMIT=795af34a7287f064effd91ed251e6bb711f1f5ee
 
 RUN apt-get update
 RUN apt-get install -y build-essential autotools-dev autoconf automake net-tools libtool \
@@ -10,12 +10,6 @@ RUN wget https://github.com/openlink/virtuoso-opensource/archive/${VIRTUOSO_COMM
 RUN tar xzf ${VIRTUOSO_COMMIT}.tar.gz
 WORKDIR virtuoso-opensource-${VIRTUOSO_COMMIT}
 
-# See https://github.com/openlink/virtuoso-opensource/blob/9cececaca5df32c82576e5390062475bbf5e1cc1/libsrc/Wi/mkgit_head.sh
-# mkgit_head.sh doesn't do what it is expected to do since our downloaded tar doesn't have git history
-# Provide libsrc/Wi/git_head.c manually
-RUN export VALUE=$(echo $VIRTUOSO_COMMIT | head -c 7); echo "#define GIT_HEAD_STR \"$VALUE\"" > libsrc/Wi/git_head.c
-RUN export VALUE=$(echo $VIRTUOSO_COMMIT | head -c 7); echo "char * git_head = \"$VALUE\";" >> libsrc/Wi/git_head.c
-
 # Build virtuoso from source
 RUN ./autogen.sh
 RUN export CFLAGS="-O2 -m64" \
diff --git a/README.md b/README.md
index f27a6f0..aeef16e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Docker for hosting Virtuoso.
 
 The Virtuoso is built from a specific commit SHA in https://github.com/openlink/virtuoso-opensource.
-This image is currently build from commit [64663f91c657aec14bbdcef8b6e5c9b6ac89cb8b](https://github.com/openlink/virtuoso-opensource/commit/64663f91c657aec14bbdcef8b6e5c9b6ac89cb8b), which corresponds to virtuoso 7.2.6.1. You can build this image from a different commit by providing the correct commit id as the `VIRTUOSO_COMMIT` [build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).
+This image is currently build from commit [795af34a7287f064effd91ed251e6bb711f1f5ee](https://github.com/openlink/virtuoso-opensource/commit/795af34a7287f064effd91ed251e6bb711f1f5ee), which corresponds to virtuoso 7.2.9. You can build this image from a different commit by providing the correct commit id as the `VIRTUOSO_COMMIT` [build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).
 
 ## Running your Virtuoso
     docker run --name my-virtuoso \

From 8841ce0a2353985c1ed7204ad66279227eeb3adc Mon Sep 17 00:00:00 2001
From: Niels V <niels.vandekeybus@redpencil.io>
Date: Wed, 1 Mar 2023 21:26:06 +0100
Subject: [PATCH 2/2] tweak conditional ci execution

---
 .woodpecker/.dry-run.yml | 6 +++---
 .woodpecker/.feature.yml | 9 ++++-----
 .woodpecker/.latest.yml  | 9 ++++-----
 .woodpecker/.release.yml | 8 +++-----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.woodpecker/.dry-run.yml b/.woodpecker/.dry-run.yml
index f211c63..8f3def1 100644
--- a/.woodpecker/.dry-run.yml
+++ b/.woodpecker/.dry-run.yml
@@ -4,6 +4,6 @@ pipeline:
     settings:
       repo: redpencil/virtuoso
       dry_run: true
-    when:
-      event:
-        - pull_request
+when:
+  event:
+    - pull_request
diff --git a/.woodpecker/.feature.yml b/.woodpecker/.feature.yml
index 12f5bcd..7be5159 100644
--- a/.woodpecker/.feature.yml
+++ b/.woodpecker/.feature.yml
@@ -5,8 +5,7 @@ pipeline:
     settings:
       repo: redpencil/virtuoso
       tags: ${CI_COMMIT_SOURCE_BRANCH/\//-}
-    when:
-      event:
-        - push
-branches:
-  - feature/*
+when:
+  event:
+    - pull_request
+  branch: feature/*
diff --git a/.woodpecker/.latest.yml b/.woodpecker/.latest.yml
index fbecd8e..aabc07d 100644
--- a/.woodpecker/.latest.yml
+++ b/.woodpecker/.latest.yml
@@ -5,8 +5,7 @@ pipeline:
     settings:
       repo: redpencil/virtuoso
       tags: latest
-    when:
-      event:
-        - push
-branches:
-  - master
+when:
+  event:
+    - push
+  branch: master
diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml
index 0154616..d0f38bb 100644
--- a/.woodpecker/.release.yml
+++ b/.woodpecker/.release.yml
@@ -5,8 +5,6 @@ pipeline:
     settings:
       repo: redpencil/virtuoso
       tags: ${CI_REPO_TAG##v} # strips v from the tag
-    when:
-      event: tag
-      tag: v*
-branches:
-  - master
+when:
+  event: tag
+  tag: v*