Skip to content

Commit 5d73393

Browse files
committed
Fix CI failures and remove generated files from Git
1 parent 4345802 commit 5d73393

File tree

42 files changed

+151
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+151
-191
lines changed

.github/workflows/maven.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040

4141
runs-on: ${{ matrix.os }}
4242
strategy:
43+
fail-fast: false
4344
matrix:
4445
os: [ubuntu-latest, windows-latest, macos-latest]
4546

@@ -62,9 +63,7 @@ jobs:
6263
- name: clone javacc-8-java
6364
uses: actions/checkout@v4
6465
with:
65-
repository: javacc/javacc-8-java.git
6666
path: javacc-8-java
67-
ref: release
6867

6968
- name: Set up JDK 11
7069
uses: actions/setup-java@v4
@@ -73,13 +72,6 @@ jobs:
7372
java-version: '11'
7473
cache: 'maven'
7574

76-
- name: Cache Maven packages
77-
uses: actions/cache@v4
78-
with:
79-
path: ~/.m2
80-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
81-
restore-keys: ${{ runner.os }}-m2
82-
8375
# -B: batch mode; -e: produce execution error messages;
8476
# -X: debug mode; -N: non-recursive (don't build submodules)
8577

@@ -88,6 +80,21 @@ jobs:
8880

8981
- name: Run install on javacc-8-core
9082
run: mvn install -B --show-version --file javacc-8-core/pom.xml
91-
92-
- name: Run install on javacc-8-java
83+
- name: Run install on javacc-8-java (posix)
84+
if: ${{ matrix.os != 'windows-latest' }}
85+
run: USERPROFILE=$HOME mvn install -B --show-version --file javacc-8-java/pom.xml
86+
- name: Run install on javacc-8-java (windows)
87+
env:
88+
MAVEN_OPTS: -Dfile.encoding=utf-8
89+
if: ${{ matrix.os == 'windows-latest' }}
9390
run: mvn install -B --show-version --file javacc-8-java/pom.xml
91+
92+
- name: Upload output files for review
93+
uses: actions/upload-artifact@v4
94+
if: always()
95+
with:
96+
name: outputs-${{ matrix.os }}
97+
path: |
98+
**/*.out
99+
**/*.err
100+
**/build.log

examples/Gwt/pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
8888
<configuration>
8989
<mainClass>GwtSimpleParser</mainClass>
9090
<arguments>
91-
<argument>${project.basedir}/simple/out</argument>
92-
<argument>${project.basedir}/simple/err</argument>
91+
<argument>${project.basedir}/simple/compiler.out</argument>
92+
<argument>${project.basedir}/simple/compiler.err</argument>
9393
</arguments>
9494
</configuration>
9595
</execution>
@@ -102,8 +102,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
102102
<configuration>
103103
<mainClass>GwtUnicodeParser</mainClass>
104104
<arguments>
105-
<argument>${project.basedir}/unicode/out</argument>
106-
<argument>${project.basedir}/unicode/err</argument>
105+
<argument>${project.basedir}/unicode/compiler.out</argument>
106+
<argument>${project.basedir}/unicode/compiler.err</argument>
107107
</arguments>
108108
</configuration>
109109
</execution>
@@ -122,18 +122,18 @@ THE POSSIBILITY OF SUCH DAMAGE.
122122
</goals>
123123
<configuration>
124124
<target>
125-
<available file="${project.basedir}/simple/out" property="isActualAvailable" />
125+
<available file="${project.basedir}/simple/compiler.out" property="isActualAvailable" />
126126
<fail unless="isActualAvailable"
127-
message="${project.basedir}/simple/out does not exist!" />
128-
<available file="${project.basedir}/simple/ref" property="isExpectedAvailable" />
127+
message="${project.basedir}/simple/compiler.out does not exist!" />
128+
<available file="${project.basedir}/simple/compiler.ref" property="isExpectedAvailable" />
129129
<fail unless="isExpectedAvailable"
130-
message="${project.basedir}/simple/ref does not exist!" />
130+
message="${project.basedir}/simple/compiler.ref does not exist!" />
131131
<condition property="files.match">
132-
<filesmatch file1="${project.basedir}/simple/out"
133-
file2="${project.basedir}/simple/ref" textfile="true" />
132+
<filesmatch file1="${project.basedir}/simple/compiler.out"
133+
file2="${project.basedir}/simple/compiler.ref" textfile="true" />
134134
</condition>
135135
<fail unless="files.match"
136-
message="${project.basedir}/simple/out does not match ${project.basedir}/simple/ref!" />
136+
message="${project.basedir}/simple/compiler.out does not match ${project.basedir}/simple/compiler.ref!" />
137137
</target>
138138
</configuration>
139139
</execution>
@@ -145,18 +145,18 @@ THE POSSIBILITY OF SUCH DAMAGE.
145145
</goals>
146146
<configuration>
147147
<target>
148-
<available file="${project.basedir}/unicode/out" property="isActualAvailable" />
148+
<available file="${project.basedir}/unicode/compiler.out" property="isActualAvailable" />
149149
<fail unless="isActualAvailable"
150-
message="${project.basedir}/unicode/out does not exist!" />
151-
<available file="${project.basedir}/unicode/ref" property="isExpectedAvailable" />
150+
message="${project.basedir}/unicode/compiler.out does not exist!" />
151+
<available file="${project.basedir}/unicode/compiler.ref" property="isExpectedAvailable" />
152152
<fail unless="isExpectedAvailable"
153-
message="${project.basedir}/unicode/ref does not exist!" />
153+
message="${project.basedir}/unicode/compiler.ref does not exist!" />
154154
<condition property="files.match">
155-
<filesmatch file1="${project.basedir}/unicode/out"
156-
file2="${project.basedir}/unicode/ref" textfile="true" />
155+
<filesmatch file1="${project.basedir}/unicode/compiler.out"
156+
file2="${project.basedir}/unicode/compiler.ref" textfile="true" />
157157
</condition>
158158
<fail unless="files.match"
159-
message="${project.basedir}/unicode/out does not match ${project.basedir}/unicode/ref!" />
159+
message="${project.basedir}/unicode/compiler.out does not match ${project.basedir}/unicode/compiler.ref!" />
160160
</target>
161161
</configuration>
162162
</execution>

examples/Gwt/simple/err

Whitespace-only changes.

examples/Gwt/simple/out

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/Gwt/unicode/err

Whitespace-only changes.

examples/Gwt/unicode/out

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)