From cdc1108a36348f3115e80f6a76ccc981121505dd Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Mon, 11 Aug 2025 14:15:19 +0200
Subject: [PATCH 1/2] update GitHub workflows for GF 3.12 + newer runner

---
 .github/workflows/release.yml | 17 ++++++++++++-----
 .github/workflows/test.yml    | 12 ++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4c1f9643..1f113e0d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,19 +8,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-24.04
     env:
-      GF_VERSION: 3.10-1
+      GF_VERSION: 3.12
       DEST: gf-rgl-${{ github.event.inputs.tag  }}
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+
+    - name: Download GF
+      uses: dsaltares/fetch-gh-release-asset@1.1.1
+      with:
+        repo: 'GrammaticalFramework/gf-core'
+        version: 'tags/${{ env.GF_VERSION }}'
+        file: 'gf-${{ env.GF_VERSION }}-ubuntu-24.04.deb'
+        token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install GF
       run: |
-        curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
-        sudo dpkg -i gf.deb
+        sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
 
     - name: Build RGL
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 251055ec..9a270764 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,26 +6,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
-      GF_VERSION: 3.11
+      GF_VERSION: 3.12
       DEST: gf-rgl
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Download GF
       uses: dsaltares/fetch-gh-release-asset@1.1.1
       with:
         repo: 'GrammaticalFramework/gf-core'
-        version: 'tags/${{ env.GF_VERSION }}'
-        file: 'gf-${{ env.GF_VERSION }}-ubuntu-20.04.deb'
+        version: 'tags/release-${{ env.GF_VERSION }}'
+        file: 'gf-${{ env.GF_VERSION }}-ubuntu-24.04.deb'
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install GF
       run: |
-        sudo dpkg -i gf-${GF_VERSION}-ubuntu-20.04.deb
+        sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
 
     - name: Build RGL
       run: |

From a0a8d9987275a4fe0a5b44147868010b4b13f43d Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Mon, 11 Aug 2025 14:43:38 +0200
Subject: [PATCH 2/2] don't use record extension with PTypes

the current (non-majestic) runtime doesn't support it
---
 src/dutch/ResDut.gf    |  2 +-
 src/romanian/ResRon.gf | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dutch/ResDut.gf b/src/dutch/ResDut.gf
index 6a980920..c8d009f4 100644
--- a/src/dutch/ResDut.gf
+++ b/src/dutch/ResDut.gf
@@ -513,7 +513,7 @@ param
   -- IL2018-02: a whole lot of times we only need number and person, not gender
   -- maybe switch to PersAgr at some point and halve the number of fields
   oper PersAgr : PType = {n : Number ; p : Person} ;
-  oper Agr : PType = PersAgr ** {g : Gender} ;
+  oper Agr : PType = {n : Number ; p : Person ; g : Gender} ;
 
   oper
     pagr : Agr -> PersAgr = \agr -> { p = agr.p ; n = agr.n } ;
diff --git a/src/romanian/ResRon.gf b/src/romanian/ResRon.gf
index fbb5bfa6..6497092e 100644
--- a/src/romanian/ResRon.gf
+++ b/src/romanian/ResRon.gf
@@ -502,13 +502,13 @@ oper
    
 -- Agreements :
 
--- for relatives 
-  
+-- for relatives
+
  AAgr : PType = {g : Gender ; n : Number} ;
-  
+
 -- for agreement between subject and predicate
-  
- Agr  : PType = AAgr ** {p : Person} ;
+
+ Agr  : PType = {g : Gender ; n : Number ; p : Person} ;
 
 
 -- clause building function :