From a2b84c1019031bd1761ba91dd423f7c125342044 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jkingston@duckduckgo.com>
Date: Wed, 16 Oct 2024 20:12:12 +0100
Subject: [PATCH] Release debugging

---
 .github/workflows/build-pr.yml |  2 +-
 .github/workflows/build.yml    | 34 +++++++++++++++++++++-------------
 .github/workflows/tests.yml    |  6 +++---
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index dc17c84b3f..8c087118f4 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -9,7 +9,7 @@ permissions: write-all
 jobs:
   build:
     if: github.event.action != 'closed'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e57852184f..0ed79df278 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,8 @@
 name: Release
 
 on:
+  pull_request:
+    types: [opened, synchronize, closed, ready_for_review]
   workflow_dispatch:
     inputs:
       version:
@@ -21,9 +23,10 @@ jobs:
 
       - name: Fetch files and checkout
         run: |
-          git fetch --all
-          git checkout releases
-          git checkout main .
+          git fetch origin
+          git checkout -b main origin/main
+          git checkout -b releases origin/releases
+          git checkout main -- .
 
       - name: Build release
         run: |
@@ -46,13 +49,18 @@ jobs:
         run: |
           bash ./scripts/changelog.sh > ${{ github.workspace }}-CHANGELOG.txt
 
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body_path: ${{ github.workspace }}-CHANGELOG.txt
-          draft: false
-          prerelease: false
-          tag_name: ${{ github.event.inputs.version }}
-          target_commitish: "releases"
+      - name: Debug changelog file
+        run: |
+          ls -la ${{ github.workspace }}/CHANGELOG.txt
+          cat ${{ github.workspace }}/CHANGELOG.txt
+    
+      #- name: Create Release
+      #  uses: softprops/action-gh-release@v2
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #  with:
+      #    body_path: ${{ github.workspace }}-CHANGELOG.txt
+      #    draft: false
+      #    prerelease: false
+      #    tag_name: ${{ github.event.inputs.version }}
+      #    target_commitish: "releases"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 61fbe263ff..723c9b2b15 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-latest ]
+        os: [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 20
@@ -37,7 +37,7 @@ jobs:
       - name: "Clean tree"
         run: "npm run test-clean-tree"
   integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
     - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
       run: npm run docs
 
   deploy-docs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: integration
     if: ${{ github.ref == 'refs/heads/main' }}
     environment: