File tree Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -38,16 +38,10 @@ jobs:
3838 git commit -m "Automatic Update" || echo "No changes to commit"
3939 git push --set-upstream origin for-stackage
4040
41- - name : " Update master branch"
41+ - name : " Update master branch with index-state-hashes.nix "
4242 run : |
4343 git checkout master
44- git merge for-stackage --allow-unrelated-histories --no-edit
45-
46- # Remove files only needed for stackage
47- rm -rf hackage nix
48- rm hackage.json update.sh default.nix
49-
50- # Stage deletions and any other changes, and commit if there are differences.
51- git add -A
52- git diff --cached --quiet || git commit -m "Update index-state-only branch"
53- git push
44+ git checkout for-stackage -- index-state-hashes.nix
45+ git add index-state-hashes.nix
46+ git commit -m "Update index-state-hashes.nix" || echo "No changes to commit"
47+ git push
You can’t perform that action at this time.
0 commit comments