Skip to content

Commit c1ebcc6

Browse files
authored
Merge pull request #275 from stoffu/aeon-ci-workaround
build-windows: include 5 needed DLLs in the package
2 parents 488d83c + f6fae9d commit c1ebcc6

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ jobs:
5454
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-protobuf-c git zip curl
5555
- name: build
5656
run: USE_SINGLE_BUILDDIR=1 make release-static-win64 -j2
57+
- name: copy dependent DLLs
58+
run: |
59+
cp $MSYSTEM_PREFIX/bin/libwinpthread-1.dll .
60+
cp $MSYSTEM_PREFIX/bin/libstdc++-6.dll .
61+
cp $MSYSTEM_PREFIX/bin/libssp-0.dll .
62+
cp $MSYSTEM_PREFIX/bin/libiconv-2.dll .
63+
cp $MSYSTEM_PREFIX/bin/libgcc_s_seh-1.dll .
64+
working-directory: build/release/bin
5765
- name: archive
5866
run: |
5967
export ARTIFACT_NAME="aeon-win-x64-$(git describe --tags)"

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Dates are provided in the format YYYY-MM-DD.
9999
| 592000 | 2015-08-04 | v1 (exceptional, version not bumped) | v0.9.0.0 | v0.9.14.0 | blocktime = 240 seconds, CryptoNight-Lite, lower mining priority for ringsize < 3 |
100100
| 963500 | 2018-06-03 | v7 | v0.12.0.0 | v0.12.9.0-aeon | Rebase to Monero's latest codebase with RingCT disabled, CryptoNight-Lite variant 1, limited use of ringsize 1, ban ringsize 2 |
101101
| 1146200 | 2019-10-25 | v8 | v0.13.0.0-aeon | v0.13.1.0-aeon | Switch to K12 PoW, reduced tx size with Borromean sigs, fixed ringsize 3, long-term block size, enforced 10 block age |
102-
| 1280000 | 2020-11-11 | v9 | v0.14.1.0-aeon | v0.14.2.1-aeon | Difficulty algorithm variant 9 (cut/sort removed, lag reduced to 8), change to the block median used to calculate penalty, deterministic unlock times |
102+
| 1280000 | 2020-11-11 | v9 | v0.14.1.0-aeon | v0.14.2.2-aeon | Difficulty algorithm variant 9 (cut/sort removed, lag reduced to 8), change to the block median used to calculate penalty, deterministic unlock times |
103103

104104
## Compiling Aeon from source
105105

@@ -168,7 +168,7 @@ invokes cmake commands as needed.
168168
* Change to the root of the source code directory, change to the most recent release tag, and build:
169169

170170
cd aeon
171-
git checkout v0.14.2.1-aeon
171+
git checkout v0.14.2.2-aeon
172172
make
173173

174174
*Optional*: If your machine has several cores and enough memory, enable
@@ -232,7 +232,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
232232
```
233233
git clone https://github.com/aeonix/aeon.git
234234
cd aeon
235-
git checkout tags/v0.14.2.1-aeon
235+
git checkout tags/v0.14.2.2-aeon
236236
```
237237
* Build:
238238
```
@@ -329,9 +329,9 @@ application.
329329

330330
cd aeon
331331

332-
* If you would like a specific [version/tag](https://github.com/aeonix/aeon/tags), do a git checkout for that version. eg. 'v0.14.2.1-aeon'. If you dont care about the version and just want binaries from master, skip this step:
332+
* If you would like a specific [version/tag](https://github.com/aeonix/aeon/tags), do a git checkout for that version. eg. 'v0.14.2.2-aeon'. If you dont care about the version and just want binaries from master, skip this step:
333333

334-
git checkout v0.14.2.1-aeon
334+
git checkout v0.14.2.2-aeon
335335

336336
* If you are on a 64-bit system, run:
337337

src/version.cpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
2-
#define DEF_MONERO_VERSION "0.14.2.1"
2+
#define DEF_MONERO_VERSION "0.14.2.2"
33
#define DEF_MONERO_RELEASE_NAME "Chronos"
44
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
55
#define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@

0 commit comments

Comments
 (0)