Skip to content

Commit 0adeeab

Browse files
ca333ca333
authored
Merge pull request #623 from KomodoPlatform/dev
v0.9.0 [Drogon]
2 parents a89b6e8 + 3c4ae5d commit 0adeeab

File tree

237 files changed

+1601
-59445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+1601
-59445
lines changed

‎.github/workflows/komodo_linux_ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-20.04
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717

1818
- name: Install deps (Linux)
1919

@@ -54,7 +54,7 @@ jobs:
5454
needs: linux-build
5555

5656
steps:
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5858

5959
- name: Install deps (Dice, Token, Faucet, Rewards CC)
6060
run: |
@@ -91,7 +91,7 @@ jobs:
9191
needs: linux-build
9292

9393
steps:
94-
- uses: actions/checkout@v2
94+
- uses: actions/checkout@v3
9595

9696
- name: Install deps (OraclesCC)
9797
run: |
@@ -128,7 +128,7 @@ jobs:
128128
needs: linux-build
129129

130130
steps:
131-
- uses: actions/checkout@v2
131+
- uses: actions/checkout@v3
132132

133133
- name: Install deps (BasicRPC)
134134
run: |
@@ -165,7 +165,7 @@ jobs:
165165
needs: linux-build
166166

167167
steps:
168-
- uses: actions/checkout@v2
168+
- uses: actions/checkout@v3
169169

170170
- name: Install deps (ChannelsCC)
171171
run: |
@@ -202,7 +202,7 @@ jobs:
202202
needs: linux-build
203203

204204
steps:
205-
- uses: actions/checkout@v2
205+
- uses: actions/checkout@v3
206206

207207
- name: Install deps (HeirCC)
208208
run: |

‎.github/workflows/komodo_mac_ci.yml

+21-20
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010

1111
macos-build:
1212
name: MacOS Build
13-
runs-on: macos-latest
13+
runs-on: macos-latest-large
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717

1818
# Workaround for https://github.com/actions/setup-python/issues/577
1919
- name: Clean up binaries and links (macOS)
@@ -31,29 +31,30 @@ jobs:
3131
- name: Install deps (macOS)
3232
run: |
3333
brew update
34-
brew upgrade || true
3534
brew tap discoteq/discoteq; brew install flock
3635
brew install autoconf autogen automake
37-
brew install gcc@8
3836
brew install binutils
3937
brew install protobuf
4038
brew install coreutils
4139
brew install wget
4240
brew install python3
43-
brew install gmp
4441
42+
# https://www.jessesquires.com/blog/2020/01/06/selecting-an-xcode-version-on-github-ci/
43+
# https://github.com/actions/runner-images/issues/2619 (bsdtar issues)
44+
# flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
4545
- name: Build (macOS)
4646
run: |
47-
# flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
48-
export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
4947
./zcutil/build-mac-dtest.sh -j4
50-
tar -czvf komodo-macos.tar.gz src/komodod src/komodo-cli
48+
gtar -czvf komodo-macos.tar.gz src/komodod src/komodo-cli src/wallet-utility src/komodo-tx
49+
# env:
50+
# DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
5151

5252
- name: Upload komodo-macos.tar.gz as artifact
53-
uses: actions/upload-artifact@v1
53+
uses: actions/upload-artifact@v4
5454
with:
5555
name: komodo-macos
56-
path: ./komodo-macos.tar.gz
56+
path: |
57+
./komodo-macos.tar.gz
5758
5859
macos-test-dice-token-reards-faucet-cc:
5960
if: ${{ false }}
@@ -63,7 +64,7 @@ jobs:
6364
needs: macos-build
6465

6566
steps:
66-
- uses: actions/checkout@v2
67+
- uses: actions/checkout@v4
6768

6869
- name: Install deps (Dice, Token, Faucet, Rewards CC)
6970
run: |
@@ -72,7 +73,7 @@ jobs:
7273
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
7374
7475
- name: Download komodo-macos.tar.gz
75-
uses: actions/download-artifact@v1
76+
uses: actions/download-artifact@v4
7677
with:
7778
name: komodo-macos
7879

@@ -93,15 +94,15 @@ jobs:
9394
needs: macos-build
9495

9596
steps:
96-
- uses: actions/checkout@v2
97+
- uses: actions/checkout@v4
9798

9899
- name: Install deps (OraclesCC)
99100
run: |
100101
brew install python3 curl
101102
python3 -m pip install setuptools wheel
102103
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
103104
- name: Download komodo-macos.tar.gz
104-
uses: actions/download-artifact@v1
105+
uses: actions/download-artifact@v4
105106
with:
106107
name: komodo-macos
107108

@@ -122,15 +123,15 @@ jobs:
122123
needs: macos-build
123124

124125
steps:
125-
- uses: actions/checkout@v2
126+
- uses: actions/checkout@v4
126127

127128
- name: Install deps (BasicRPC)
128129
run: |
129130
brew install python3 curl
130131
python3 -m pip install setuptools wheel
131132
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
132133
- name: Download komodo-macos.tar.gz
133-
uses: actions/download-artifact@v1
134+
uses: actions/download-artifact@v4
134135
with:
135136
name: komodo-macos
136137

@@ -151,15 +152,15 @@ jobs:
151152
needs: macos-build
152153

153154
steps:
154-
- uses: actions/checkout@v2
155+
- uses: actions/checkout@v4
155156

156157
- name: Install deps (ChannelsCC)
157158
run: |
158159
brew install python3 curl
159160
python3 -m pip install setuptools wheel
160161
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
161162
- name: Download komodo-macos.tar.gz
162-
uses: actions/download-artifact@v1
163+
uses: actions/download-artifact@v4
163164
with:
164165
name: komodo-macos
165166

@@ -180,15 +181,15 @@ jobs:
180181
needs: macos-build
181182

182183
steps:
183-
- uses: actions/checkout@v2
184+
- uses: actions/checkout@v4
184185

185186
- name: Install deps (HeirCC)
186187
run: |
187188
brew install python3 curl
188189
python3 -m pip install setuptools wheel
189190
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
190191
- name: Download komodo-macos.tar.gz
191-
uses: actions/download-artifact@v1
192+
uses: actions/download-artifact@v4
192193
with:
193194
name: komodo-macos
194195

‎.github/workflows/komodo_win_ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Install deps(mingw)
1919
env:
2020
DEBIAN_FRONTEND: noninteractive
@@ -80,7 +80,7 @@ jobs:
8080
runs-on: windows-latest
8181

8282
steps:
83-
- uses: actions/checkout@v2
83+
- uses: actions/checkout@v3
8484

8585
- name: Download komodo_win.zip
8686
uses: actions/download-artifact@v1
@@ -111,7 +111,7 @@ jobs:
111111
needs: windows-build
112112

113113
steps:
114-
- uses: actions/checkout@v2
114+
- uses: actions/checkout@v3
115115

116116
- name: Download komodo_win.zip
117117
uses: actions/download-artifact@v1
@@ -142,7 +142,7 @@ jobs:
142142
needs: windows-build
143143

144144
steps:
145-
- uses: actions/checkout@v2
145+
- uses: actions/checkout@v3
146146

147147
- name: Download komodo_win.zip
148148
uses: actions/download-artifact@v1
@@ -173,7 +173,7 @@ jobs:
173173
needs: windows-build
174174

175175
steps:
176-
- uses: actions/checkout@v2
176+
- uses: actions/checkout@v3
177177

178178
- name: Download komodo_win.zip
179179
uses: actions/download-artifact@v1
@@ -204,7 +204,7 @@ jobs:
204204
needs: windows-build
205205

206206
steps:
207-
- uses: actions/checkout@v2
207+
- uses: actions/checkout@v3
208208

209209
- name: Download komodo_win.zip
210210
uses: actions/download-artifact@v1

‎.github/workflows/komodod_cd.yml

+25-10
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
name: Komodo CD test releases
44

5-
65
on:
76
push:
87
branches:
98
- beta
109
- dev
1110
- research
1211
- master
12+
workflow_dispatch:
1313

1414
jobs:
1515

@@ -30,7 +30,7 @@ jobs:
3030
id: shortify_commit
3131

3232
- name: Checkout code
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
3434

3535
- name: Install deps (Linux)
3636
env:
@@ -76,28 +76,41 @@ jobs:
7676

7777
osx-build:
7878
name: OSX Build
79-
runs-on: macos-latest
79+
if: ${{ github.event_name != 'workflow_dispatch' }}
80+
runs-on: macos-latest-large
81+
8082
steps:
81-
- uses: actions/checkout@v2
83+
- uses: actions/checkout@v4
84+
85+
# Workaround for https://github.com/actions/setup-python/issues/577
86+
- name: Clean up binaries and links (macOS)
87+
run: |
88+
rm -f /usr/local/bin/2to3-3.*
89+
rm -f /usr/local/bin/idle3.*
90+
rm -f /usr/local/bin/pydoc3.*
91+
rm -f /usr/local/bin/python3.*
92+
rm -f /usr/local/bin/2to3
93+
rm -f /usr/local/bin/idle3
94+
rm -f /usr/local/bin/pydoc3
95+
rm -f /usr/local/bin/python3
96+
rm -f /usr/local/bin/python3-config
97+
8298
- name: Install deps (macOS)
8399
run: |
84-
rm '/usr/local/bin/2to3'
85-
brew unlink node
86100
brew update
87-
brew upgrade || true
88101
brew tap discoteq/discoteq; brew install flock
89102
brew install autoconf autogen automake
90-
brew install gcc@8
91103
brew install binutils
92104
brew install protobuf
93105
brew install coreutils
94106
brew install wget
95107
brew install python3
96-
brew install gmp
108+
97109
- name: Build (macOS)
98110
run: |
99111
./zcutil/build-mac.sh -j4
100112
zip --junk-paths komodo-osx src/komodod src/komodo-cli
113+
101114
- name: Upload komodo-osx.zip as artifact
102115
uses: actions/upload-artifact@v1
103116
with:
@@ -106,10 +119,11 @@ jobs:
106119

107120
windows-build:
108121
name: Windows Build (mingw)
122+
if: ${{ github.event_name != 'workflow_dispatch' }}
109123
runs-on: ubuntu-latest
110124

111125
steps:
112-
- uses: actions/checkout@v2
126+
- uses: actions/checkout@v3
113127
- name: Install deps (Windows)
114128
env:
115129
DEBIAN_FRONTEND: noninteractive
@@ -140,6 +154,7 @@ jobs:
140154

141155
publish-release:
142156
name: Publishing CD releases
157+
if: ${{ github.event_name != 'workflow_dispatch' }}
143158
runs-on: ubuntu-20.04
144159
needs: [linux-build, osx-build, windows-build]
145160
steps:

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ src/config/bitcoin-config.h
3535
src/config/bitcoin-config.h.in
3636
src/config/stamp-h1
3737
share/setup.nsi
38+
src/cryptoconditions/src/cryptoconditions-config.h.in
3839

3940
cache/
4041
venv-mnf/
@@ -45,7 +46,7 @@ src/univalue/gen
4546
.idea
4647
.libs
4748
.*.swp
48-
*.*~*
49+
*~
4950
*.bak
5051
*.rej
5152
*.orig
@@ -124,6 +125,9 @@ src/komodo-tx.exe
124125
#output during builds, symbol tables?
125126
*.dSYM
126127

128+
src/*_7776
129+
*_7776
130+
127131

128132
src/cryptoconditions/compile
129133

0 commit comments

Comments
 (0)