Debug code rollback 1

lutaml · May 25, 2022 · d85f592 · d85f592
1 parent cbeb7ed
commit d85f592
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 8,904 deletions.
diff --git a/.github/workflows/rake.yml b/.github/workflows/rake.yml
@@ -2,7 +2,7 @@ name: rake
 
 on:
   push:
-#    branches: [ master, main ]
+    branches: [ master, main ]
   pull_request:
 
 jobs:
@@ -63,15 +63,15 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-#      - name: Process cache
-#        uses: actions/cache@v2
-#        id: cache
-#        with:
-#          path: lib/expressir/express/express_parser.*
-#          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
+      - name: Process cache
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: lib/expressir/express/express_parser.*
+          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
       - name: Build native extension
-#        if: steps.cache.outputs.cache-hit != 'true'
+        if: steps.cache.outputs.cache-hit != 'true'
         run: bundle exec rake compile
 
       - name: Run tests

diff --git a/ext/express-parser/express_parser.cpp b/ext/express-parser/express_parser.cpp
@@ -6,8 +6,8 @@
 #include "antlrgen/ExpressBaseVisitor.h"
 #include "antlrgen/ExpressLexer.h"
 
-#include "rice-x/rice.hpp"
-#include "rice-x/stl.hpp"
+#include "rice/rice.hpp"
+#include "rice/stl.hpp"
 
 
 #ifdef _WIN32