Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Install Nix with cached packages
uses: rikhuijzer/cache-install@v1.1.4
with:
key: nix-${{ hashFiles('.github/workflows/maven.yml', 'default.nix', 'nix/**', 'pom.xml', 'local-maven-repo') }}
nix_file: nix/github-workflow-dependencies.nix
- uses: cachix/install-nix-action@v31
# The dependencies could be cached if necessary. See PR #156 and da11a13c1451f5a52672fe494ac6e20116346865 for additional information.
- name: Build
run: nix-build
- name: Upload Javadoc artifact
Expand Down
21 changes: 19 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,24 @@
system ? builtins.currentSystem,
pkgs ?
import sources.nixpkgs {
overlays = [];
overlays = [
(final: previous: {
defaultGemConfig = previous.defaultGemConfig // {
jekyll-github-metadata = attrs: {
dontBuild = false;
patches = [
(final.fetchpatch {
url = "https://github.com/jekyll/github-metadata/commit/17cc5af5e1fd95d98d43676610cc8a47969350ab.patch";
hash = "sha256-dUqvnYsjfG5xQIYS48B3xz0GLVYo2BrDAnYUafmDFKw=";
relative = "lib";
stripLen = 1;
extraPrefix = "lib/jekyll-github-metadata/";
})
];
};
};
})
];
config = {};
inherit system;
},
Expand Down Expand Up @@ -93,7 +110,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
if buildGitHubPages
then ''
mvn javadoc:javadoc
JEKYLL_ENV=production PAGES_REPO_NWO=VariantSync/DiffDetective JEKYLL_BUILD_REVISION= github-pages build
JEKYLL_ENV=production PAGES_REPO_NWO=VariantSync/DiffDetective JEKYLL_BUILD_REVISION= PAGES_DISABLE_NETWORK=1 github-pages build
rm -rf _site/target
''
else ""
Expand Down
16 changes: 0 additions & 16 deletions nix/github-workflow-dependencies.nix

This file was deleted.