From e36b36b00bbb3be55c49901c0412d37f4d2bac2f Mon Sep 17 00:00:00 2001
From: Scott Aubrey <scott@aubrey.org.uk>
Date: Fri, 25 Oct 2024 08:47:53 +0100
Subject: [PATCH] test a master-branch release

---
 .github/workflows/ci.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ac74a2c8..0d9e3fcd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
         id: trunkver
         uses: crftd-tech/trunkver@main
         with:
-          prerelease: ${{ github.ref == 'refs/heads/master' && 'false' || 'true' }}
+          prerelease: ${{ github.ref == 'refs/pull/260/merge' && 'false' || 'true' }}
   tests:
     runs-on: ubuntu-latest
     steps:
@@ -38,10 +38,10 @@ jobs:
   build-and-push:
     needs: [generate-version, tests]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    # if: github.ref == 'refs/heads/master'
     env:
       IMAGE_REPO: ghcr.io/elifesciences/api-dummy
-      IMAGE_TAG: ${{ github.ref == 'refs/heads/master' && needs.generate-version.outputs.trunkver || format('{0}-{1}', github.head_ref || github.ref_name, needs.generate-version.outputs.trunkver) }}
+      IMAGE_TAG: ${{ github.ref == 'refs/pull/260/merge' && needs.generate-version.outputs.trunkver || format('{0}-{1}', github.head_ref || github.ref_name, needs.generate-version.outputs.trunkver) }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU