Skip to content

Commit f104bdb

Browse files
committed
Merge branch 'develop'
2 parents b7b2b1b + ba314b5 commit f104bdb

1,164 files changed

Lines changed: 26352 additions & 116657 deletions

File tree

Some content is hidden

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

.github/workflows/maven.yml

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,46 @@ on:
77
push:
88
branches: [ "main", "develop" ]
99
pull_request:
10-
branches: [ "main", "develop" ]
10+
branches:
1111

1212
jobs:
1313
build:
1414

1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- name: Install Graphviz
19-
run: sudo apt-get install -y graphviz
2018
- uses: actions/checkout@v3
21-
- name: Set up JDK 17
22-
uses: actions/setup-java@v3
19+
- name: Install Nix with cached packages
20+
uses: rikhuijzer/[email protected]
21+
with:
22+
key: nix-${{ hashFiles('.github/workflows/maven.yml', 'default.nix', 'nix/**') }}
23+
nix_file: nix/github-workflow-dependencies.nix
24+
- name: Build
25+
run: nix-build
26+
- name: Upload Javadoc artifact
27+
if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' }}
28+
uses: actions/upload-pages-artifact@v1
2329
with:
24-
java-version: '17'
25-
distribution: 'temurin'
26-
cache: maven
27-
- name: Build with Maven
28-
run: mvn -B package --file pom.xml
30+
path: result/share/doc/DiffDetective
31+
32+
# An additional job is recommened in the documentation of `actions/deploy-pages`
33+
deploy-javadoc:
34+
runs-on: ubuntu-latest
35+
36+
if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' }}
37+
38+
needs: build
39+
40+
# Deploy to the github-pages environment
41+
environment:
42+
name: github-pages
43+
url: ${{ steps.deployment.outputs.page_url }}
44+
45+
permissions:
46+
pages: write # to deploy to Pages
47+
id-token: write # to verify the deployment originates from an appropriate source
48+
49+
steps:
50+
- name: Publish Javadoc to Github Pages
51+
id: deployment
52+
uses: actions/deploy-pages@v1

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.vscode/
12

23
# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,maven
34
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,maven
@@ -121,6 +122,7 @@ patches/*
121122
/input
122123
/error
123124
examples/
125+
docs/javadoc
124126

125127
/log.txt
126128

.run/EditClassValidation.run.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="EditClassValidation" type="Application" factoryName="Application" nameIsGenerated="true">
3+
<option name="MAIN_CLASS_NAME" value="org.variantsync.diffdetective.validation.EditClassValidation" />
4+
<module name="diffdetective" />
5+
<method v="2">
6+
<option name="Make" enabled="true" />
7+
</method>
8+
</configuration>
9+
</component>

.run/Validation.run.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

Dockerfile

Lines changed: 0 additions & 75 deletions
This file was deleted.

INSTALL.md

Lines changed: 0 additions & 159 deletions
This file was deleted.

0 commit comments

Comments
 (0)