forked from GitHub/gf-rgl
Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl
This commit is contained in:
17
.github/workflows/release.yml
vendored
17
.github/workflows/release.yml
vendored
@@ -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: |
|
||||
|
||||
12
.github/workflows/test.yml
vendored
12
.github/workflows/test.yml
vendored
@@ -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: |
|
||||
|
||||
@@ -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 } ;
|
||||
|
||||
@@ -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 :
|
||||
|
||||
Reference in New Issue
Block a user