Merge pull request #275 from stoffu/aeon-ci-workaround

build-windows: include 5 needed DLLs in the package
aeonix · Aug 2, 2022 · c1ebcc6 · c1ebcc6
2 parents 488d83c + f6fae9d
commit c1ebcc6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,6 +54,14 @@ jobs:
         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
     - name: build
       run: USE_SINGLE_BUILDDIR=1 make release-static-win64 -j2
+    - name: copy dependent DLLs
+      run: |
+        cp $MSYSTEM_PREFIX/bin/libwinpthread-1.dll .
+        cp $MSYSTEM_PREFIX/bin/libstdc++-6.dll .
+        cp $MSYSTEM_PREFIX/bin/libssp-0.dll .
+        cp $MSYSTEM_PREFIX/bin/libiconv-2.dll .
+        cp $MSYSTEM_PREFIX/bin/libgcc_s_seh-1.dll .
+      working-directory: build/release/bin
     - name: archive
       run: |
         export ARTIFACT_NAME="aeon-win-x64-$(git describe --tags)"

diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 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       |
 | 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   |
 | 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   |
-| 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   |
+| 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   |
 
 ## Compiling Aeon from source
 
@@ -168,7 +168,7 @@ invokes cmake commands as needed.
 * Change to the root of the source code directory, change to the most recent release tag, and build:
 
         cd aeon
-        git checkout v0.14.2.1-aeon
+        git checkout v0.14.2.2-aeon
         make
 
     *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 (
 ```
         git clone https://github.com/aeonix/aeon.git
 	cd aeon
-	git checkout tags/v0.14.2.1-aeon
+	git checkout tags/v0.14.2.2-aeon
 ```
 * Build:
 ```
@@ -329,9 +329,9 @@ application.
 
         cd aeon
 
-* 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:
+* 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:
 
-        git checkout v0.14.2.1-aeon
+        git checkout v0.14.2.2-aeon
 
 * If you are on a 64-bit system, run:
 

diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
-#define DEF_MONERO_VERSION "0.14.2.1"
+#define DEF_MONERO_VERSION "0.14.2.2"
 #define DEF_MONERO_RELEASE_NAME "Chronos"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@