Skip to content

Commit

Permalink
Fixed tests.yml (Go version error)
Browse files Browse the repository at this point in the history
  • Loading branch information
asmyasnikov authored and 1NepuNep1 committed Jan 20, 2025
1 parent be7b33c commit 36e7ebb
Show file tree
Hide file tree
Showing 25 changed files with 138,144 additions and 15,085 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.20.x, 1.21.x]
go-version: [1.22.x, 1.23.x]
os: [ubuntu, windows, macos]

runs-on: ${{ matrix.os }}-latest
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.venv
.env
.vscode/*
.vscode/*
*/*.tokens
*/*.interp
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ARG COMMIT_HASH
ENV ANTLR_VERSION=$ANTLR_VERSION
ENV COMMIT_HASH=$COMMIT_HASH

ENV ANTLR_VERSION=4.13.2
RUN curl -O https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar

ENV CLASSPATH=".:/antlr-${ANTLR_VERSION}-complete.jar:$CLASSPATH"
Expand Down
26 changes: 22 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
IMAGE_NAME=yql-antlr-parser:latest
CURRENT_DIR := $(shell pwd)

ANTLR_VERSION = 4.13.2
COMMIT_HASH ?= 99ceb562485efe2cefe47db042606e38259640c6
ANTLR_VERSION = 4.13.1
COMMIT_HASH ?= 5aec4caba5b112b6f5e519f465890a784032e05e

.PHONY: build-image clean go python dotnet java all go_clean py_clean
.PHONY: build-image clean go ts js python dotnet java all go_clean py_clean

all: go python dotnet java
all: go ts js python dotnet java

go: build-image
docker run --rm -v "$(CURRENT_DIR)/go":/workspace/go $(IMAGE_NAME) \
java -jar /antlr-${ANTLR_VERSION}-complete.jar -Dlanguage=Go -package yql_antlr4_parser -o go YQL.g4

ts: build-image
docker run --rm -v "$(CURRENT_DIR)/ts":/workspace/ts $(IMAGE_NAME) \
java -jar /antlr-${ANTLR_VERSION}-complete.jar -Dlanguage=TypeScript -package yql_antlr4_parser -o ts YQL.g4

js: build-image
docker run --rm -v "$(CURRENT_DIR)/js":/workspace/js $(IMAGE_NAME) \
java -jar /antlr-${ANTLR_VERSION}-complete.jar -Dlanguage=JavaScript -package yql_antlr4_parser -o js YQL.g4

python: build-image
docker run --rm -v "$(CURRENT_DIR)/python":/workspace/python $(IMAGE_NAME) \
java -jar /antlr-${ANTLR_VERSION}-complete.jar -Dlanguage=Python3 -o python YQL.g4
Expand All @@ -35,6 +43,16 @@ go_clean:
rm -rf go/*.interp
rm -rf go/*.tokens

ts_clean:
rm -rf go/*.ts
rm -rf go/*.interp
rm -rf go/*.tokens

js_clean:
rm -rf go/*.ts
rm -rf go/*.interp
rm -rf go/*.tokens

python_clean:
rm -rf python/*.py
rm -rf python/*.interp
Expand Down
6 changes: 3 additions & 3 deletions dotnet/YQLBaseListener.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.13.2
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from YQL.g4 by ANTLR 4.13.2
// Generated from YQL.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -32,7 +32,7 @@ namespace YQLAntlr4Parser {
/// which can be extended to create a listener which only needs to handle a subset
/// of the available methods.
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.2")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.Diagnostics.DebuggerNonUserCode]
[System.CLSCompliant(false)]
public partial class YQLBaseListener : IYQLListener {
Expand Down
2,342 changes: 1,173 additions & 1,169 deletions dotnet/YQLLexer.cs

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dotnet/YQLListener.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.13.2
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from YQL.g4 by ANTLR 4.13.2
// Generated from YQL.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -28,7 +28,7 @@ namespace YQLAntlr4Parser {
/// This interface defines a complete listener for a parse tree produced by
/// <see cref="YQLParser"/>.
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.2")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.CLSCompliant(false)]
public interface IYQLListener : IParseTreeListener {
/// <summary>
Expand Down
3,222 changes: 1,646 additions & 1,576 deletions dotnet/YQLParser.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go/yql_base_listener.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,352 changes: 1,678 additions & 1,674 deletions go/yql_lexer.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go/yql_listener.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 36e7ebb

Please sign in to comment.