Skip to content

Commit 968432e

Browse files
authored
Merge pull request IntersectMBO#5680 from IntersectMBO/sl/node-8.8.1
blst version upgrade and CHaP bump
2 parents ea26fda + 9c561e2 commit 968432e

File tree

8 files changed

+45
-40
lines changed

8 files changed

+45
-40
lines changed

.github/workflows/release-upload.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ jobs:
4646
needs: [wait-for-hydra]
4747
strategy:
4848
matrix:
49-
arch: [linux, macos, win64]
49+
# Disable windows until libblst works for windows cross compilation builds
50+
# arch: [linux, macos, win64]
51+
arch: [linux, macos]
5052
name: "Download Asset from the Cache"
5153
runs-on: ubuntu-latest
5254
steps:
@@ -95,14 +97,16 @@ jobs:
9597
- uses: actions/download-artifact@v3
9698
with:
9799
name: ${{ github.sha }}-macos
98-
- uses: actions/download-artifact@v3
99-
with:
100-
name: ${{ github.sha }}-win64
100+
# Disable windows until libblst works for windows cross compilation builds
101+
# - uses: actions/download-artifact@v3
102+
# with:
103+
# name: ${{ github.sha }}-win64
101104
- name: Release
102105
uses: input-output-hk/action-gh-release@v1
103106
with:
104107
draft: true
105108
files: |
106-
cardano-node-*-win64.zip
109+
# Disable windows until libblst works for windows cross compilation builds
110+
# cardano-node-*-win64.zip
107111
cardano-node-*-macos.tar.gz
108112
cardano-node-*-linux.tar.gz

bench/tx-generator/tx-generator.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ library
100100
, bytestring
101101
, cardano-api ^>= 8.38
102102
, cardano-binary
103-
, cardano-cli ^>= 8.20.0.0
103+
, cardano-cli ^>= 8.20.1.0
104104
, cardano-crypto-class
105105
, cardano-crypto-wrapper
106106
, cardano-data

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2024-02-06T15:14:59Z
17-
, cardano-haskell-packages 2024-02-07T07:51:35Z
17+
, cardano-haskell-packages 2024-02-20T15:00:00Z
1818

1919
packages:
2020
cardano-git-rev

cardano-node/cardano-node.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-node
4-
version: 8.8.0
4+
version: 8.8.1
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,

cardano-submit-api/cardano-submit-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, bytestring
4242
, cardano-api ^>= 8.38
4343
, cardano-binary
44-
, cardano-cli ^>= 8.20.0.0
44+
, cardano-cli ^>= 8.20.1.0
4545
, cardano-crypto-class ^>= 2.1.2
4646
, http-media
4747
, iohk-monitoring

cardano-testnet/cardano-testnet.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ library
3535
, ansi-terminal
3636
, bytestring
3737
, cardano-api ^>= 8.38
38-
, cardano-cli ^>= 8.20.0.0
38+
, cardano-cli ^>= 8.20.1.0
3939
, cardano-crypto-class
4040
, cardano-crypto-wrapper
4141
, cardano-ledger-alonzo

flake.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -285,26 +285,27 @@
285285
internal.roots.project = muslProject.roots;
286286
variants = mapAttrs (_: v: removeAttrs v.musl ["variants"]) ciJobsVariants;
287287
};
288-
windows =
289-
let
290-
windowsProject = project.projectCross.mingwW64;
291-
projectExes = collectExes windowsProject;
292-
in
293-
projectExes
294-
// (removeRecurse {
295-
inherit (windowsProject) checks tests benchmarks;
296-
cardano-node-win64 = import ./nix/binary-release.nix {
297-
inherit pkgs;
298-
inherit (exes.cardano-node.identifier) version;
299-
platform = "win64";
300-
exes = lib.collect lib.isDerivation (
301-
# FIXME: restore tx-generator once plutus-scripts-bench is fixed for windows:
302-
removeAttrs projectExes [ "tx-generator" ]
303-
);
304-
};
305-
internal.roots.project = windowsProject.roots;
306-
variants = mapAttrs (_: v: removeAttrs v.windows ["variants"]) ciJobsVariants;
307-
});
288+
# Disable windows until libblst works for windows cross compilation builds
289+
#windows =
290+
# let
291+
# windowsProject = project.projectCross.mingwW64;
292+
# projectExes = collectExes windowsProject;
293+
# in
294+
# projectExes
295+
# // (removeRecurse {
296+
# inherit (windowsProject) checks tests benchmarks;
297+
# cardano-node-win64 = import ./nix/binary-release.nix {
298+
# inherit pkgs;
299+
# inherit (exes.cardano-node.identifier) version;
300+
# platform = "win64";
301+
# exes = lib.collect lib.isDerivation (
302+
# # FIXME: restore tx-generator once plutus-scripts-bench is fixed for windows:
303+
# removeAttrs projectExes [ "tx-generator" ]
304+
# );
305+
# };
306+
# internal.roots.project = windowsProject.roots;
307+
# variants = mapAttrs (_: v: removeAttrs v.windows ["variants"]) ciJobsVariants;
308+
# });
308309
} // optionalAttrs (system == "x86_64-darwin") {
309310
native = lib.filterAttrs
310311
(n: _:

0 commit comments

Comments
 (0)