-
Notifications
You must be signed in to change notification settings - Fork 152
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch from using mavenix to using `buildMavenPackage` back-ported from the upcoming nixpkgs 23.11 stable release. This may increase build times somewhat and updating maven dependencies will no longer be automatic, but arguably the automation never works and It's difficult to figure out why it's failing. I've updated the README troubleshooting section with the two cases of manual intervention, necessary with the new packaging solution, when maven dependencies change. The hash mismatch should only happen when deps change, but if we want to automate this in ci then we can do something similar to: https://github.com/runtimeverification/hs-backend-booster/blob/175f10b16ad50dd2bb50fcfe68cbcacd79760317/scripts/update-haskell-backend.sh#L21C3-L22
- Loading branch information
1 parent
774f16a
commit ce5b128
Showing
10 changed files
with
273 additions
and
7,303 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,49 +51,6 @@ jobs: | |
version: v1.18.1 | ||
args: "--dry-run --set-exit-if-changed" | ||
|
||
nix-maven: | ||
name: 'Nix: Maven' | ||
runs-on: ubuntu-20.04 | ||
needs: format-check | ||
steps: | ||
|
||
- name: 'Check out code, set up Git' | ||
uses: actions/checkout@v3 | ||
with: | ||
submodules: recursive | ||
fetch-depth: 0 | ||
- run: | | ||
git config user.name devops | ||
git config user.email [email protected] | ||
- name: 'Install Nix' | ||
uses: cachix/install-nix-action@v22 | ||
with: | ||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install | ||
extra_nix_config: | | ||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
substituters = http://cache.nixos.org https://hydra.iohk.io | ||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= | ||
- name: 'Install Cachix' | ||
uses: cachix/cachix-action@v12 | ||
with: | ||
name: k-framework | ||
authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' | ||
skipPush: true | ||
|
||
- name: 'Update Maven dependencies, push changes' | ||
run: | | ||
set -x | ||
git checkout ${GITHUB_HEAD_REF} | ||
if ! git diff --exit-code origin/${GITHUB_BASE_REF} origin/${GITHUB_HEAD_REF} \ | ||
-- $(find . -name pom.xml); then | ||
nix run .#update-maven | ||
fi | ||
if git add nix/ && git commit -m 'Update Nix lock files'; then | ||
git push | ||
fi | ||
test-k: | ||
name: 'K Tests' | ||
runs-on: [self-hosted, linux, normal] | ||
|
@@ -225,7 +182,6 @@ jobs: | |
- runner: MacM1 | ||
os: self-macos-12 | ||
runs-on: ${{ matrix.runner }} | ||
needs: [nix-maven] | ||
steps: | ||
- name: 'Check out code' | ||
uses: actions/checkout@v3 | ||
|
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.