From 28302b5941b75b415a6f5ff4ad2b79391e1b6f5b Mon Sep 17 00:00:00 2001 From: Snider Date: Fri, 22 Mar 2024 09:09:42 +0000 Subject: [PATCH] windows build --- .github/workflows/cli-testnet.yml | 9 +++------ Makefile | 8 ++++++++ contrib/cmake/conandata.yml | 5 +---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cli-testnet.yml b/.github/workflows/cli-testnet.yml index 414aeab9..28d5bf32 100644 --- a/.github/workflows/cli-testnet.yml +++ b/.github/workflows/cli-testnet.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-11,macos-12, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-11,macos-12, windows-2019] include: - os: ubuntu-latest target: linux-amd64 @@ -33,11 +33,8 @@ jobs: - os: macos-12 target: macos-amd64 net: testnet - - os: macos-13 - target: macos-amd64 - net: testnet - - os: macos-14 - target: macos-arm64 + - os: windows-2019 + target: windows-amd64 net: testnet env: CCACHE_TEMPDIR: ${{ github.workspace }}/ccache diff --git a/Makefile b/Makefile index 1bc9d08d..cc96849a 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,14 @@ ci-package-linux: @cp -r build/release/src/lethean-cli-wallet lethean/lethean-cli-wallet @chmod +x lethean/lethean* +ci-package-windows: + @rm -fr lethean && mkdir -p lethean + @cp -r build\\release\\src\\letheand.exe lethean\\letheand.exe + @cp -r build\\release\\src\\lethean-cli-wallet.exe lethean\\lethean-cli-wallet.exe + +ci-windows-amd64-release: static-release ci-package-windows ## Build lethean-windows-amd64-cli.tar.bz2 + @tar -cjvf lethean-windows-amd64-cli.tar.bz2 lethean/ + ci-linux-amd64-release: static-release ci-package-linux ## Build lethean-linux-amd64-cli.tar.bz2 @tar -cjvf lethean-linux-amd64-cli.tar.bz2 lethean/ diff --git a/contrib/cmake/conandata.yml b/contrib/cmake/conandata.yml index cb146797..a0227c29 100644 --- a/contrib/cmake/conandata.yml +++ b/contrib/cmake/conandata.yml @@ -1,6 +1,3 @@ -# This file is managed by Conan, contents will be overwritten. -# To keep your changes, remove these comment lines, but the plugin won't be able to modify your requirements - requirements: - "openssl/3.2.1" - - "boost/1.84.0" \ No newline at end of file + - "boost/1.84.0"