From 150489753b6c477dd5e54becd5edbb064a08cb13 Mon Sep 17 00:00:00 2001 From: yann Date: Tue, 2 Apr 2024 16:28:27 +0200 Subject: [PATCH] rename snapi-parser to parsers --- .github/workflows/ci.yaml | 2 +- .github/workflows/publish.yaml | 10 +++++----- .gitignore | 6 +++--- hard-rebuild.sh | 2 +- {snapi-parser => parsers}/build.sh | 0 {snapi-parser => parsers}/pom.xml | 2 +- {snapi-parser => parsers}/publish.sh | 0 {snapi-parser => parsers}/release.sh | 0 .../src/main/java/module-info.java | 0 .../src/main/java/raw/psql/grammar/PsqlLexer.g4 | 0 .../src/main/java/raw/psql/grammar/PsqlParser.g4 | 0 {snapi-parser => parsers}/src/main/java/raw/readme.md | 0 .../src/main/java/raw/snapi/grammar/SnapiLexer.g4 | 0 .../src/main/java/raw/snapi/grammar/SnapiParser.g4 | 0 rebuild.sh | 2 +- snapi-frontend/project/Dependencies.scala | 4 ++-- sql-client/project/Dependencies.scala | 4 ++-- 17 files changed, 16 insertions(+), 16 deletions(-) rename {snapi-parser => parsers}/build.sh (100%) rename {snapi-parser => parsers}/pom.xml (99%) rename {snapi-parser => parsers}/publish.sh (100%) rename {snapi-parser => parsers}/release.sh (100%) rename {snapi-parser => parsers}/src/main/java/module-info.java (100%) rename {snapi-parser => parsers}/src/main/java/raw/psql/grammar/PsqlLexer.g4 (100%) rename {snapi-parser => parsers}/src/main/java/raw/psql/grammar/PsqlParser.g4 (100%) rename {snapi-parser => parsers}/src/main/java/raw/readme.md (100%) rename {snapi-parser => parsers}/src/main/java/raw/snapi/grammar/SnapiLexer.g4 (100%) rename {snapi-parser => parsers}/src/main/java/raw/snapi/grammar/SnapiParser.g4 (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2f1e8e441..cfa39f3ad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: - client/** - snapi-client/** - snapi-frontend/** - - snapi-parser/** + - parsers/** - snapi-truffle/** - python-client/** - sql-client/** diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index db37c651f..83041b34c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -138,7 +138,7 @@ jobs: > run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed :x: reactions: confused - publish-snapi-parser: + publish-parsers: runs-on: self-hosted steps: - if: github.event_name != 'repository_dispatch' @@ -184,13 +184,13 @@ jobs: }] - if: github.event_name == 'repository_dispatch' name: publish to snapshots repo - working-directory: snapi-parser + working-directory: parsers run: | ./publish.sh echo SNAPI_PARSER_VER="$(cat version)" >> $GITHUB_ENV - if: github.event_name != 'repository_dispatch' name: release - working-directory: snapi-parser + working-directory: parsers run: | ./release.sh echo SNAPI_PARSER_VER="$(cat version)" >> $GITHUB_ENV @@ -201,7 +201,7 @@ jobs: repository: ${{ github.event.client_payload.github.payload.repository.full_name }} comment-id: ${{ github.event.client_payload.github.payload.comment.id }} body: | - > published snapi-parser version: ${{ env.SNAPI_PARSER_VER }} + > published parsers version: ${{ env.SNAPI_PARSER_VER }} reactions: rocket - if: failure() && github.event_name == 'repository_dispatch' uses: peter-evans/create-or-update-comment@v4 @@ -210,6 +210,6 @@ jobs: repository: ${{ github.event.client_payload.github.payload.repository.full_name }} comment-id: ${{ github.event.client_payload.github.payload.comment.id }} body: | - > something went wrong with `publish-snapi-parser` + > something went wrong with `publish-parsers` > run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) :x: reactions: confused diff --git a/.gitignore b/.gitignore index a569e061d..0d506f430 100644 --- a/.gitignore +++ b/.gitignore @@ -72,9 +72,9 @@ snapi-client/version sql-client/version snapi-frontend/version snapi-truffle/version -snapi-parser/version +parsers/version python-client/version -snapi-parser/src/main/java/raw/compiler/rql2/generated -snapi-parser/src/main/java/raw/client/sql/generated +parsers/src/main/java/raw/compiler/rql2/generated +parsers/src/main/java/raw/client/sql/generated **/pom.xml.versionsBackup diff --git a/hard-rebuild.sh b/hard-rebuild.sh index a0dc46568..9e9da8a35 100755 --- a/hard-rebuild.sh +++ b/hard-rebuild.sh @@ -10,7 +10,7 @@ cd ../client rm -rf target/ sbt clean publishLocal -cd ../snapi-parser +cd ../parsers rm -rf target/ sbt clean publishLocal diff --git a/snapi-parser/build.sh b/parsers/build.sh similarity index 100% rename from snapi-parser/build.sh rename to parsers/build.sh diff --git a/snapi-parser/pom.xml b/parsers/pom.xml similarity index 99% rename from snapi-parser/pom.xml rename to parsers/pom.xml index 21e058f2d..0ecd3a830 100644 --- a/snapi-parser/pom.xml +++ b/parsers/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.raw-labs - raw-snapi-parser + raw-parsers ${revision}${changelist} jar diff --git a/snapi-parser/publish.sh b/parsers/publish.sh similarity index 100% rename from snapi-parser/publish.sh rename to parsers/publish.sh diff --git a/snapi-parser/release.sh b/parsers/release.sh similarity index 100% rename from snapi-parser/release.sh rename to parsers/release.sh diff --git a/snapi-parser/src/main/java/module-info.java b/parsers/src/main/java/module-info.java similarity index 100% rename from snapi-parser/src/main/java/module-info.java rename to parsers/src/main/java/module-info.java diff --git a/snapi-parser/src/main/java/raw/psql/grammar/PsqlLexer.g4 b/parsers/src/main/java/raw/psql/grammar/PsqlLexer.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/psql/grammar/PsqlLexer.g4 rename to parsers/src/main/java/raw/psql/grammar/PsqlLexer.g4 diff --git a/snapi-parser/src/main/java/raw/psql/grammar/PsqlParser.g4 b/parsers/src/main/java/raw/psql/grammar/PsqlParser.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/psql/grammar/PsqlParser.g4 rename to parsers/src/main/java/raw/psql/grammar/PsqlParser.g4 diff --git a/snapi-parser/src/main/java/raw/readme.md b/parsers/src/main/java/raw/readme.md similarity index 100% rename from snapi-parser/src/main/java/raw/readme.md rename to parsers/src/main/java/raw/readme.md diff --git a/snapi-parser/src/main/java/raw/snapi/grammar/SnapiLexer.g4 b/parsers/src/main/java/raw/snapi/grammar/SnapiLexer.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/snapi/grammar/SnapiLexer.g4 rename to parsers/src/main/java/raw/snapi/grammar/SnapiLexer.g4 diff --git a/snapi-parser/src/main/java/raw/snapi/grammar/SnapiParser.g4 b/parsers/src/main/java/raw/snapi/grammar/SnapiParser.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/snapi/grammar/SnapiParser.g4 rename to parsers/src/main/java/raw/snapi/grammar/SnapiParser.g4 diff --git a/rebuild.sh b/rebuild.sh index 85d6e2e7a..4ffbfb190 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -14,7 +14,7 @@ cd "${SCRIPT_HOME}/utils" cd "${SCRIPT_HOME}/client" ./build.sh -cd "${SCRIPT_HOME}/snapi-parser" +cd "${SCRIPT_HOME}/parsers" ./build.sh cd "${SCRIPT_HOME}/snapi-frontend" diff --git a/snapi-frontend/project/Dependencies.scala b/snapi-frontend/project/Dependencies.scala index 82bbe54c6..51a60f564 100755 --- a/snapi-frontend/project/Dependencies.scala +++ b/snapi-frontend/project/Dependencies.scala @@ -8,8 +8,8 @@ object Dependencies { val rawClientVersion = IO.read(new File("../client/version")).trim val rawClient = "com.raw-labs" %% "raw-client" % rawClientVersion - val rawSnapiParserVersion = IO.read(new File("../snapi-parser/version")).trim - val rawSnapiParser = "com.raw-labs" % "raw-snapi-parser" % rawSnapiParserVersion + val rawSnapiParserVersion = IO.read(new File("../parsers/version")).trim + val rawSnapiParser = "com.raw-labs" % "raw-parsers" % rawSnapiParserVersion val kiamaVersion = IO.read(new File("../deps/kiama/version")).trim diff --git a/sql-client/project/Dependencies.scala b/sql-client/project/Dependencies.scala index 1dabd3499..096edeb3a 100755 --- a/sql-client/project/Dependencies.scala +++ b/sql-client/project/Dependencies.scala @@ -8,8 +8,8 @@ object Dependencies { val rawSnapiFrontendVersion = IO.read(new File("../snapi-frontend/version")).trim val rawSnapiFrontend = "com.raw-labs" %% "raw-snapi-frontend" % rawSnapiFrontendVersion - val rawSnapiParserVersion = IO.read(new File("../snapi-parser/version")).trim - val rawSnapiParser = "com.raw-labs" % "raw-snapi-parser" % rawSnapiParserVersion + val rawSnapiParserVersion = IO.read(new File("../parsers/version")).trim + val rawSnapiParser = "com.raw-labs" % "raw-parsers" % rawSnapiParserVersion val kiamaVersion = IO.read(new File("../deps/kiama/version")).trim val kiama = "org.bitbucket.inkytonik.kiama" %% "kiama" % kiamaVersion