forked from jverein/jverein
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature_vollzahler_input
- Loading branch information
Showing
278 changed files
with
11,251 additions
and
3,644 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # This workflow will build a Java project with Ant | ||
| # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant | ||
|
|
||
| name: OpenJVerein build check | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened, synchronize, edited] | ||
| paths: | ||
| - 'plugin.xml' | ||
| - 'build/**' | ||
| - 'lib/**' | ||
| - 'lib.src/**' | ||
| - 'src/**' | ||
| jobs: | ||
| call-reusable-workflow: | ||
| uses: ./.github/workflows/reusable-build.yml | ||
|
|
||
| build-check: | ||
| needs: call-reusable-workflow | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Restore cached tags and jars | ||
| id: cache-tags-jars | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| ./cached-tags | ||
| jameica | ||
| hibiscus | ||
| key: ${{ runner.os }}-${{ github.repository_id }} | ||
|
|
||
| - name: Checkout openjverein | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| path: jverein | ||
|
|
||
| - name: Build openjverein plugin | ||
| working-directory: ./ | ||
| run: ant -noinput -buildfile jverein/build/build.xml compile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| name: Reusable build steps | ||
|
|
||
| on: | ||
| workflow_call: | ||
|
|
||
| jobs: | ||
| setup-java-and-cache: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up JDK for x64 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '11' | ||
| distribution: 'temurin' | ||
| architecture: x64 | ||
|
|
||
| - name: Set env | ||
| id: setenvs | ||
| run: | | ||
| jameica_tag=$(git ls-remote --refs --tags --sort="-v:refname" https://github.com/willuhn/jameica.git V_\* | head -1 | cut -f 2 | cut -d / -f 3) | ||
| echo "jameica_tag=${jameica_tag}" >> $GITHUB_ENV | ||
| hibiscus_tag=$(git ls-remote --refs --tags --sort="-v:refname" https://github.com/willuhn/hibiscus.git V_\* | head -1 | cut -f 2 | cut -d / -f 3) | ||
| echo "hibiscus_tag=${hibiscus_tag}" >> $GITHUB_ENV | ||
| echo "### jameica_tag: ${jameica_tag} | hibiscus_tag: ${hibiscus_tag}" | ||
| - name: Restore cached tags and folders | ||
| id: cache-tags-jars | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| ./cached-tags | ||
| jameica | ||
| hibiscus | ||
| key: ${{ runner.os }}-${{ github.repository_id }} | ||
|
|
||
| - name: Load cached tags | ||
| id: load-cache | ||
| run: | | ||
| if [ -f ./cached-tags/jameica_tag ]; then | ||
| cached_jameica_tag=$(cat ./cached-tags/jameica_tag) | ||
| echo "cached_jameica_tag=${cached_jameica_tag}" >> $GITHUB_ENV | ||
| else | ||
| echo "cached_jameica_tag=" >> $GITHUB_ENV | ||
| fi | ||
| if [ -f ./cached-tags/hibiscus_tag ]; then | ||
| cached_hibiscus_tag=$(cat ./cached-tags/hibiscus_tag) | ||
| echo "cached_hibiscus_tag=${cached_hibiscus_tag}" >> $GITHUB_ENV | ||
| else | ||
| echo "cached_hibiscus_tag=" >> $GITHUB_ENV | ||
| fi | ||
| echo "### cached_jameica_tag: ${cached_jameica_tag} | cached_hibiscus_tag: ${cached_hibiscus_tag}" | ||
| - name: Checkout jameica | ||
| if: ${{ env.cached_jameica_tag != env.jameica_tag }} | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: willuhn/jameica | ||
| path: jameica | ||
| ref: ${{ env.jameica_tag }} | ||
|
|
||
| - name: Build jameica jar | ||
| if: ${{ env.cached_jameica_tag != env.jameica_tag }} | ||
| working-directory: ./ | ||
| run: | | ||
| ant -noinput -buildfile jameica/build/build.xml jar | ||
| find jameica/releases/ -type f -name jameica.jar -exec cp {} jameica/releases/jameica-lib.jar \; | ||
| - name: Checkout hibiscus | ||
| if: ${{ env.cached_hibiscus_tag != env.hibiscus_tag }} | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: willuhn/hibiscus | ||
| path: hibiscus | ||
| ref: ${{ env.hibiscus_tag }} | ||
|
|
||
| - name: Build hibiscus jar | ||
| if: ${{ env.cached_hibiscus_tag != env.hibiscus_tag }} | ||
| working-directory: ./ | ||
| run: | | ||
| ant -noinput -buildfile hibiscus/build/build.xml jar | ||
| find hibiscus/releases/ -type f -name hibiscus.jar -exec cp {} hibiscus/releases/hibiscus-lib.jar \; | ||
| - name: Create cache files and needed folders | ||
| run: | | ||
| mkdir -p ./cached-tags | ||
| echo "${{ env.jameica_tag }}" > ./cached-tags/jameica_tag | ||
| echo "${{ env.hibiscus_tag }}" > ./cached-tags/hibiscus_tag | ||
| - name: Cache tags and folders | ||
| uses: actions/cache@v4 | ||
| if: always() | ||
| with: | ||
| path: | | ||
| ./cached-tags | ||
| jameica | ||
| hibiscus | ||
| key: ${{ runner.os }}-${{ github.repository_id }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=1.7 | ||
| org.eclipse.jdt.core.compiler.compliance=11 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.source=1.7 | ||
| org.eclipse.jdt.core.compiler.source=11 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.