Skip to content

Commit

Permalink
chore: remove depclean (#6053)
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinWitt authored Nov 3, 2024
1 parent ff410a4 commit 269d938
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Time nix setup
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command true
- name: Build spoon
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command mvn -f spoon-pom -B install -Dmaven.test.skip=true -DskipDepClean
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command mvn -f spoon-pom -B install -Dmaven.test.skip=true
- name: Run Javadoc quality check
run: nix develop ${{ env.NIX_OPTIONS }} .#extraChecks --command javadoc-quality

Expand Down
2 changes: 1 addition & 1 deletion chore/check-reproducible-builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
set -e

build() {
mvn -f spoon-pom clean package -DskipDepClean -DskipTests -Dmaven.javadoc.skip > /dev/null
mvn -f spoon-pom clean package -DskipTests -Dmaven.javadoc.skip > /dev/null
}

compare_files() {
Expand Down
5 changes: 0 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,13 @@
mvn -q checkstyle:checkstyle -Pcheckstyle-test
# Check documentation links
python3 ./chore/check-links-in-doc.py
# Analyze dependencies through DepClean in spoon-core
# mvn -q depclean:depclean
pushd spoon-decompiler || exit 1
mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
mvn -q versions:update-parent -DallowSnapshots=true
git diff
mvn -q test
mvn -q checkstyle:checkstyle license:check
# mvn -q depclean:depclean
popd || exit 1
pushd spoon-control-flow || exit 1
Expand All @@ -140,7 +137,6 @@
mvn -q versions:update-parent -DallowSnapshots=true
git diff
mvn -q test
# mvn -q depclean:depclean
popd || exit 1
pushd spoon-smpl || exit 1
Expand All @@ -149,7 +145,6 @@
git diff
mvn -q -Djava.src.version=17 test
mvn -q checkstyle:checkstyle license:check
# mvn -q depclean:depclean
popd || exit 1
'');
extraRemote = pkgs.writeScriptBin "extra-remote" ''
Expand Down
18 changes: 0 additions & 18 deletions spoon-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,24 +194,6 @@
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<!-- see https://github.com/castor-software/depclean -->
<groupId>se.kth.castor</groupId>
<artifactId>depclean-maven-plugin</artifactId>
<version>2.0.6</version>
<executions>
<execution>
<goals>
<goal>depclean</goal>
</goals>
<configuration>
<!-- the build should fail if there are unused direct dependencies -->
<failIfUnusedDirect>true</failIfUnusedDirect>
<skipDepClean>true</skipDepClean>
</configuration>
</execution>
</executions>
</plugin>
</plugins>


Expand Down

0 comments on commit 269d938

Please sign in to comment.