Skip to content

Commit 31d0877

Browse files
authored
Merge pull request #674 from ethereum/intx
Upgrade intx to 0.10.1
2 parents 675c801 + 35c1189 commit 31d0877

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

circle.yml

+22-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,15 @@ executors:
5858
macos:
5959
resource_class: macos.x86.medium.gen2
6060
macos:
61-
xcode: 14.3.0
61+
xcode: 14.3.1
6262
environment:
6363
CMAKE_BUILD_PARALLEL_LEVEL: 4
64+
macos-m1:
65+
resource_class: macos.m1.large.gen1
66+
macos:
67+
xcode: 14.3.1
68+
environment:
69+
CMAKE_BUILD_PARALLEL_LEVEL: 8
6470
macos-xcode-min:
6571
resource_class: macos.x86.medium.gen2
6672
macos:
@@ -395,6 +401,18 @@ jobs:
395401
- test
396402
- package
397403

404+
release-macos-m1:
405+
executor: macos-m1
406+
environment:
407+
BUILD_TYPE: Release
408+
steps:
409+
- run:
410+
name: "Install System Dependencies"
411+
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
412+
- build
413+
- test
414+
- package
415+
398416
deploy:
399417
docker:
400418
- image: circleci/golang
@@ -571,10 +589,10 @@ jobs:
571589
- ~/corpus
572590

573591
macos-asan:
574-
executor: macos
592+
executor: macos-m1
575593
environment:
576594
BUILD_TYPE: RelWithDebInfo
577-
CMAKE_OPTIONS: -DSANITIZE=address
595+
CMAKE_OPTIONS: -DSANITIZE=address,undefined
578596
TESTS_FILTER: unittests
579597
steps:
580598
- run:
@@ -636,6 +654,7 @@ workflows:
636654
filters:
637655
tags:
638656
only: /.*/
657+
- release-macos-m1
639658
- deploy:
640659
requires:
641660
- release-linux

cmake/Hunter/config.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ hunter_cmake_args(
1212
hunter_config(
1313
intx
1414
VERSION 0.10.0
15-
URL https://github.com/chfast/intx/archive/v0.10.0.tar.gz
16-
SHA1 3a6ebe0b1a36527b6ef291ee93a8e508371e5b77
15+
URL https://github.com/chfast/intx/archive/v0.10.1.tar.gz
16+
SHA1 168e0c2ff6760bd6467e25523cc0e68447358018
1717
)

0 commit comments

Comments
 (0)