From aefbee388a4f69f87e09947c3312d0745dc9a4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 26 Jun 2024 17:17:31 +0200 Subject: [PATCH] Automatically update from base branch --- .github/workflows/uptodate.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uptodate.yaml b/.github/workflows/uptodate.yaml index 6f4af24dd..8c7d8ed01 100644 --- a/.github/workflows/uptodate.yaml +++ b/.github/workflows/uptodate.yaml @@ -9,7 +9,7 @@ on: pull_request: env: - REF_BRANCH: prod-2-8 + REF_BRANCH: prod-2-9 jobs: main: @@ -29,5 +29,13 @@ jobs: - run: ci/cleanup ../ref - run: rm ci/cleanup - - run: diff --recursive --new-file ../ref . + - run: cd ..; diff --unified --recursive --new-file demo_geomapfish ref if: always() + - run: cd ..; diff --unified --recursive --new-file demo_geomapfish ref > /tmp/base.patch || true + if: failure() + - uses: actions/upload-artifact@v4 + with: + name: Update from base branch.patch + path: /tmp/base.patch + retention-days: 1 + if: failure()