Skip to content

Commit d31f48f

Browse files
Revert "Try to update autobuild for new xalan-test via validate"
... Seems I don't have permission for that. Sigh. This reverts commit 6e8d520.
1 parent 6e8d520 commit d31f48f

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
java-version: 8
3636
- name: 'Build Xalan jars'
3737
run: |
38-
mvn --no-transfer-progress clean compile site test
38+
mvn --no-transfer-progress clean compile site verify
3939
- uses: actions/checkout@v3
4040
name: 'Checkout xalan-test'
4141
with:
@@ -45,20 +45,18 @@ jobs:
4545
- name: 'Cheat xalan-test up to be sibling of xalan-java'
4646
run: |
4747
mv xalan-test ..; ls ..
48-
- name: "Invoke xalan-test from xalan-java"
48+
- name: 'Run xalan-test tests'
49+
working-directory: ../xalan-test
50+
# NOTE: "alltest" target includes conformance tests known not to run in Xalan,
51+
# as well as having dependencies on some targets which have since been edited
52+
# out. The following is our typical minimal build test as documented in README,
53+
# minus conf.xsltc since that one is currently throwing four known failures and
54+
# isn't set up to say "but that's not a regression".
55+
56+
# NOTE: Adjustments made for mvn build leaving things in a slightly different
57+
# place than ant build did (and recreating /lib).
4958
run: |
50-
mvn --no-transfer-progress verify
51-
# - name: 'OLD: Run xalan-test tests directly'
52-
# working-directory: ../xalan-test
53-
# # NOTE: "alltest" target includes conformance tests known not to run in Xalan,
54-
# # as well as having dependencies on some targets which have since been edited
55-
# # out. The following is our typical minimal build test as documented in README,
56-
# # minus conf.xsltc since that one is currently throwing four known failures and
57-
# # isn't set up to say "but that's not a regression".
58-
# # NOTE: Adjustments made for mvn build leaving things in a slightly different
59-
# # place than ant build did (and recreating /lib).
60-
# run: |
61-
# ls; ant -debug jar extensions.classes smoketest apitest -Dxalan.relpath=../xalan-java -Dparserjar=../xalan-java/lib/xercesImpl-2.12.2.jar -Dxml-apis.jar=../xalan-java/lib/xml-apis-1.4.01.jar
59+
ls; ant -debug jar extensions.classes smoketest apitest -Dxalan.relpath=../xalan-java -Dparserjar=../xalan-java/lib/xercesImpl-2.12.2.jar -Dxml-apis.jar=../xalan-java/lib/xml-apis-1.4.01.jar
6260
6361
# Build distribution artifacts: Used to pull xalan-test back down as child and
6462
# run fulldist:
@@ -67,5 +65,9 @@ jobs:
6765
# fulldist isn't currently a separate target in the mvn build process
6866
# A near-equivalent is being performed every time to build the .tar.gz
6967
# and .zip distribution files.
70-
71-
# TODO: REVIEW new handling of xalan-test.
68+
#
69+
# BUT NOTE that the binary distro has traditionally included
70+
# xalan-test as a subdirectory; maven build doesn't yet pull that in.
71+
# Discussion is in progress about whether it is (a) necessary, (b) a good
72+
# idea.
73+
# TODO: REVIEW.

0 commit comments

Comments
 (0)