1
0
forked from GitHub/gf-rgl

Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

This commit is contained in:
Krasimir Angelov
2025-08-12 11:13:50 +02:00
4 changed files with 24 additions and 17 deletions

View File

@@ -8,19 +8,26 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-18.04 runs-on: ubuntu-24.04
env: env:
GF_VERSION: 3.10-1 GF_VERSION: 3.12
DEST: gf-rgl-${{ github.event.inputs.tag }} DEST: gf-rgl-${{ github.event.inputs.tag }}
steps: steps:
- name: Checkout repository - 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 - name: Install GF
run: | run: |
curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
sudo dpkg -i gf.deb
- name: Build RGL - name: Build RGL
run: | run: |

View File

@@ -6,26 +6,26 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-24.04
env: env:
GF_VERSION: 3.11 GF_VERSION: 3.12
DEST: gf-rgl DEST: gf-rgl
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Download GF - name: Download GF
uses: dsaltares/fetch-gh-release-asset@1.1.1 uses: dsaltares/fetch-gh-release-asset@1.1.1
with: with:
repo: 'GrammaticalFramework/gf-core' repo: 'GrammaticalFramework/gf-core'
version: 'tags/${{ env.GF_VERSION }}' version: 'tags/release-${{ env.GF_VERSION }}'
file: 'gf-${{ env.GF_VERSION }}-ubuntu-20.04.deb' file: 'gf-${{ env.GF_VERSION }}-ubuntu-24.04.deb'
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Install GF - name: Install GF
run: | run: |
sudo dpkg -i gf-${GF_VERSION}-ubuntu-20.04.deb sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
- name: Build RGL - name: Build RGL
run: | run: |

View File

@@ -513,7 +513,7 @@ param
-- IL2018-02: a whole lot of times we only need number and person, not gender -- 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 -- maybe switch to PersAgr at some point and halve the number of fields
oper PersAgr : PType = {n : Number ; p : Person} ; oper PersAgr : PType = {n : Number ; p : Person} ;
oper Agr : PType = PersAgr ** {g : Gender} ; oper Agr : PType = {n : Number ; p : Person ; g : Gender} ;
oper oper
pagr : Agr -> PersAgr = \agr -> { p = agr.p ; n = agr.n } ; pagr : Agr -> PersAgr = \agr -> { p = agr.p ; n = agr.n } ;

View File

@@ -502,13 +502,13 @@ oper
-- Agreements : -- Agreements :
-- for relatives -- for relatives
AAgr : PType = {g : Gender ; n : Number} ; AAgr : PType = {g : Gender ; n : Number} ;
-- for agreement between subject and predicate -- for agreement between subject and predicate
Agr : PType = AAgr ** {p : Person} ; Agr : PType = {g : Gender ; n : Number ; p : Person} ;
-- clause building function : -- clause building function :