Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy latest changes from _maint into master #106

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Auto detect text files and perform LF normalization
* text=auto

# Below types are listed explicitly just in case to avoid unexpected mistakes in git auto above
*.java text
*.html text
*.xml text
*.xsl text
*.css text
*.js text

# Note: executable is a non-standard attribute, and it is helpful for the release plugin
*.sh text eol=lf executable
*.cgi text eol=lf executable

# Windows expects CRLF always
*.bat text eol=crlf
*.cmd text eol=crlf
68 changes: 68 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: CI

on:
push:
branches:
- '*'
pull_request:
branches:
- '*'

permissions:
contents: read

# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners
# GitHub Actions does not support Docker, PostgreSQL server on Windows, macOS :(

concurrency:
# On master/release, we don't want any jobs cancelled so the sha is used to name the group
# On PR branches, we cancel the job if new commits are pushed
# More info: https://stackoverflow.com/a/68422069/253468
group: ${{ github.ref == 'refs/heads/trunk' && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
cancel-in-progress: true

jobs:
build:
name: 'Java 8'
runs-on: ubuntu-latest
steps:
- name: 'Checkout xalan-java'
uses: actions/checkout@v3
- name: 'Set up JDK 8'
uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
- name: 'Build Xalan jars'
run: |
ant jar
- uses: actions/checkout@v3
name: 'Checkout xalan-test'
with:
repository: apache/xalan-test
path: xalan-test
ref: master
- name: 'Run xalan-test tests'
working-directory: xalan-test
# NOTE: "alltest" target includes conformance tests known not to run in Xalan,
# as well as having dependencies on some targets which have since been edited
# out. The following is our typical minimal build test as documented in README,
# minus conf.xsltc since that one is currently throwing four known failures and
# isn't set up to say "but that's not a regression".
run: |
ant jar extensions.classes smoketest apitest -Dxalan.relpath=../ -Dparserjar=../lib/endorsed/xercesImpl.jar -Dxml-apis.jar=../lib/endorsed/xml-apis.jar

# ant fulldist is failing: in CI
# /home/runner/work/xalan-java/xalan-java/build.xml:1399: /home/runner/work/xalan-java/xalan-test does not exist.
# Error replicated on my system if there is not a sibling xalan-test.
# NOT replicated if sibling xalan-test directory is present
# Simplest fix would be to have the above test checkout emulate the dev environment;
# better would be to fix fulldist to intelligently check both locations;
# best might be to adopt xalan-test back into the xalan repository, if it's no longer being used elsewhere.
- name: 'Cheat xalan-test up to be sibling of xalan-java'
run: |
mv xalan-test ..; ls ..
- id: build_artifacts
run: |
ant fulldist

33 changes: 32 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,33 @@
/bin/
/build/
/build/
/classes/
/.idea/
*.iml
.DS_Store

# We download the dependencies if they are missing
/lib/
/tools/java_cup.jar
/tmp/

# Generated sources
/src/org/apache/xalan/processor/XSLProcessorVersion.java
/src/org/apache/xalan/xsltc/compiler/XPathLexer.java
/src/org/apache/xalan/xsltc/compiler/XPathParser.java
/src/org/apache/xalan/xsltc/compiler/sym.java
/xdocs/sources/xalan/DONE
/xdocs/sources/xalan/XSLTCDONE
/xdocs/style/graphics/
/xdocs/style/loader.xml
/xdocs/style/resources/
/xdocs/style/stylesheets/any2header.xsl
/xdocs/style/stylesheets/any2project.xsl
/xdocs/style/stylesheets/book2group.xsl
/xdocs/style/stylesheets/book2project.xsl
/xdocs/style/stylesheets/changes2document.xsl
/xdocs/style/stylesheets/context2footer.xsl
/xdocs/style/stylesheets/context2label.xsl
/xdocs/style/stylesheets/directory2project.xsl
/xdocs/style/stylesheets/document2html.xsl
/xdocs/style/stylesheets/faqs2document.xsl
/xdocs/style/stylesheets/group2document.xsl
Loading
Loading