Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #486

Merged
merged 34 commits into from
Sep 21, 2024
Merged

Dev #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
94108a4
More fixes for https://github.com/antlr/grammars-v4/issues/4243
kaby76 Sep 16, 2024
5eec74e
Build failed. Try updating node.
kaby76 Sep 16, 2024
21583bb
Try installing TypeScript.
kaby76 Sep 16, 2024
80bf6d2
Update test.sh
kaby76 Sep 16, 2024
5203ccf
Update main.yml
kaby76 Sep 16, 2024
f2c10e5
Remove "if's"
kaby76 Sep 16, 2024
80345b7
Update main.yml
kaby76 Sep 16, 2024
95e3b51
Update main.yml
kaby76 Sep 16, 2024
6574426
Update main.yml
kaby76 Sep 16, 2024
6b9814b
Update main.yml
kaby76 Sep 16, 2024
f370222
Temp chnage to see wtf is going on.
kaby76 Sep 16, 2024
3bbc569
Find out wtf is going on.
kaby76 Sep 16, 2024
ab26b26
Install tsx npx.
kaby76 Sep 16, 2024
f6f6e54
Try again.
kaby76 Sep 16, 2024
e659bff
Remove junk.
kaby76 Sep 16, 2024
c1f5442
Updates for Antlr4ng, TypeScript, testing.
kaby76 Sep 16, 2024
5906bd1
Release 0.23.6.
kaby76 Sep 16, 2024
22476f1
Release (continued).
kaby76 Sep 16, 2024
f2591fa
Sync with grammars-v4
kaby76 Sep 16, 2024
0247d7f
Fix regression for split grammars.
kaby76 Sep 16, 2024
e247826
Fix node calls.
kaby76 Sep 17, 2024
457d45b
Fixes for build regression.
kaby76 Sep 17, 2024
c080761
Fix directory for testing with globbing patters.
kaby76 Sep 17, 2024
d0b3519
Update install. Update tests to use local tools.
kaby76 Sep 17, 2024
41179bc
Sync templates between grammars-v4 and here. Add abb grammar test.
kaby76 Sep 18, 2024
4d5c648
Force dos2unix.
kaby76 Sep 18, 2024
328013c
Clean up. Add testing with Powershell.
kaby76 Sep 18, 2024
6c1be81
Add http grammar test (no examples/).
kaby76 Sep 18, 2024
647246e
FIx multiiple top-level parser grammar resolution.
kaby76 Sep 18, 2024
76f42ae
Add kotlin-formal.
kaby76 Sep 18, 2024
bbc2033
Fix test.
kaby76 Sep 18, 2024
0923359
Narrow down import list for Antlr4ng etc because of kotlin-formal.
kaby76 Sep 18, 2024
3f6524e
Rollback antlr to 4.13.1 because 4.13.2 seems to be broken.
kaby76 Sep 18, 2024
222d580
Fix missing reference -- in JavaScript??
kaby76 Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
216 changes: 216 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
{
"version": 1,
"isRoot": true,
"tools": {
"tranalyze": {
"version": "0.23.6",
"commands": [
"tranalyze"
],
"rollForward": false
},
"trcaret": {
"version": "0.23.6",
"commands": [
"trcaret"
],
"rollForward": false
},
"trclonereplace": {
"version": "0.23.6",
"commands": [
"trclonereplace"
],
"rollForward": false
},
"trcombine": {
"version": "0.23.6",
"commands": [
"trcombine"
],
"rollForward": false
},
"trconvert": {
"version": "0.23.6",
"commands": [
"trconvert"
],
"rollForward": false
},
"trcover": {
"version": "0.23.6",
"commands": [
"trcover"
],
"rollForward": false
},
"trdot": {
"version": "0.23.6",
"commands": [
"trdot"
],
"rollForward": false
},
"trfoldlit": {
"version": "0.23.6",
"commands": [
"trfoldlit"
],
"rollForward": false
},
"trgen": {
"version": "0.23.6",
"commands": [
"trgen"
],
"rollForward": false
},
"trgenvsc": {
"version": "0.23.6",
"commands": [
"trgenvsc"
],
"rollForward": false
},
"trglob": {
"version": "0.23.6",
"commands": [
"trglob"
],
"rollForward": false
},
"triconv": {
"version": "0.23.6",
"commands": [
"triconv"
],
"rollForward": false
},
"tritext": {
"version": "0.23.6",
"commands": [
"tritext"
],
"rollForward": false
},
"trjson": {
"version": "0.23.6",
"commands": [
"trjson"
],
"rollForward": false
},
"trparse": {
"version": "0.23.6",
"commands": [
"trparse"
],
"rollForward": false
},
"trperf": {
"version": "0.23.6",
"commands": [
"trperf"
],
"rollForward": false
},
"trquery": {
"version": "0.23.6",
"commands": [
"trquery"
],
"rollForward": false
},
"trrename": {
"version": "0.23.6",
"commands": [
"trrename"
],
"rollForward": false
},
"trsort": {
"version": "0.23.6",
"commands": [
"trsort"
],
"rollForward": false
},
"trsplit": {
"version": "0.23.6",
"commands": [
"trsplit"
],
"rollForward": false
},
"trsponge": {
"version": "0.23.6",
"commands": [
"trsponge"
],
"rollForward": false
},
"trtext": {
"version": "0.23.6",
"commands": [
"trtext"
],
"rollForward": false
},
"trtokens": {
"version": "0.23.6",
"commands": [
"trtokens"
],
"rollForward": false
},
"trtree": {
"version": "0.23.6",
"commands": [
"trtree"
],
"rollForward": false
},
"trunfold": {
"version": "0.23.6",
"commands": [
"trunfold"
],
"rollForward": false
},
"trungroup": {
"version": "0.23.6",
"commands": [
"trungroup"
],
"rollForward": false
},
"trwdog": {
"version": "0.23.6",
"commands": [
"trwdog"
],
"rollForward": false
},
"trxgrep": {
"version": "0.23.6",
"commands": [
"trxgrep"
],
"rollForward": false
},
"trxml": {
"version": "0.23.6",
"commands": [
"trxml"
],
"rollForward": false
},
"trxml2": {
"version": "0.23.6",
"commands": [
"trxml2"
],
"rollForward": false
}
}
}
145 changes: 90 additions & 55 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,59 +22,94 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- name: Install dos2unix
run: |
sudo apt-get install tofrodos
sudo ln -s /usr/bin/fromdos /usr/bin/dos2unix
- uses: actions/checkout@v3
- name: Install dos2unix
run: |
sudo apt-get install tofrodos
sudo ln -s /usr/bin/fromdos /usr/bin/dos2unix
- name: Setup PHP
id: setup-php
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
ini-values: xdebug.max_nesting_level=1000
- name: Print PHP version
run: |
echo ${{ steps.setup-php.outputs.php-version }}
php --version
- name: Install Dotnet
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '8.0.x'
- name: Test Dotnet
run: |
dotnet --version
dotnet --info
dotnet --list-runtimes
dotnet --list-sdks
- name: Install Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'zulu'
- name: Test Java
run: |
dotnet --version
java --version
javac --version
- name: Install Dart
uses: dart-lang/setup-dart@v1
- name: Test Dart
run: |
dart --version
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '^1.21.0'
cache: false
- name: Test Go
run: |
go version
- name: Install Python
uses: actions/setup-python@v5.2.0
with:
python-version: '3.10'
- name: Test Python
run: |
python --version
- name: Upgrade Pip.
run: |
python -m ensurepip --upgrade
- name: Test Pip.
run: |
pip --version
- name: Install Antlr tool
run: |
pip install antlr4-tools
- name: Install JavaScript
uses: actions/setup-node@v4.0.3
with:
node-version: '21.7.3'
- name: Install npm
run: |
npm install -g npm
npm --version
- name: Test JavaScript
run: |
node --version
- name: ts-node typescript tsx
run: |
npm i -g ts-node typescript tsx
ts-node --version
tsc --version
npx -v
npx tsx -v
- name: Build
run: |
make build
make install

- name: Install Dotnet
uses: actions/setup-dotnet@v2
with:
dotnet-version: '8.0.x'
- name: Check Dotnet env
run: |
dotnet --version
dotnet --info
dotnet --list-runtimes
dotnet --list-sdks

- name: Install Dart
uses: dart-lang/setup-dart@v1
- name: Do not trust Dart env
run: |
dart --version

- name: Install Go
uses: actions/setup-go@v3
with:
go-version: '^1.19.0'
- name: Do not trust Go env
run: |
go version

- name: Install Python
uses: actions/setup-python@v4.2.0
with:
python-version: '3.10'
- name: Do not trust Python env
run: |
python --version

- name: Install JavaScript
uses: actions/setup-node@v3.4.1
with:
node-version: '16.13.0'
- name: Do not trust JavaScript env
run: |
node --version

- name: Build
run: |
make build
make install

- name: Test
run: |
cd _tests
bash all-tests.sh
- name: Test
run: |
cd _tests
bash all-tests.sh
21 changes: 21 additions & 0 deletions _scripts/install-local.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/bash
set -x
dotnet new tool-manifest
cd src
dirs=`find . -name net8.0 | fgrep 'bin/Release' | fgrep -v Generated | grep '^./tr' | fgrep -v publish | sort -u`
for i in $dirs
do
d=`echo $i | awk -F '/' '{print $2}'`
pushd $i
if [ ! -f $d.dll ]
then
popd
continue
fi
popd
pushd $d
tool=$d
dotnet tool install $tool
dotnet $tool -- --version
popd
done
2 changes: 1 addition & 1 deletion _scripts/publish.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/bash
version=0.23.5
version=0.23.6
cd src
exes=`find . -name 'tr*.exe' | grep -v publish`
for i in $exes
Expand Down
Loading
Loading