diff --git a/.github/workflows/cli-testnet.yml b/.github/workflows/cli-testnet.yml index 90565f4c..3e3f9a66 100644 --- a/.github/workflows/cli-testnet.yml +++ b/.github/workflows/cli-testnet.yml @@ -21,11 +21,17 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-latest, macos-13, macos-14 ] include: - os: ubuntu-latest target: linux-amd64 net: testnet + - os: macos-13 + target: macos-amd64 + net: testnet + - os: macos-14 + target: macos-arm64 + net: testnet env: CCACHE_TEMPDIR: ${{ github.workspace }}/ccache CONAN_HOME: "${{ github.workspace }}/build/" diff --git a/Makefile b/Makefile index 585e3e15..c68b7f12 100644 --- a/Makefile +++ b/Makefile @@ -60,21 +60,33 @@ static-release-testnet: ## Build testnet release static binaries # # CI # -ci-linux-amd64-release: static-release ## Build lethean-linux-amd64-cli.tar.bz2 + +ci-package-linux: @rm -fr lethean && mkdir -p lethean @cp -r build/release/src/letheand lethean/letheand @cp -r build/release/src/lethean-cli-wallet lethean/lethean-cli-wallet @chmod +x lethean/lethean* - @tar -cjvf lethean-linux-amd64-cli.tar.bz2 lethean/ - @rm -rf lethean -ci-linux-amd64-testnet: static-release-testnet ## Build testnet-lethean-linux-amd64-cli.tar.bz2 - @rm -fr lethean && mkdir -p lethean - @cp -r build/release/src/letheand lethean/letheand-testnet - @cp -r build/release/src/lethean-cli-wallet lethean/lethean-cli-wallet-testnet - @chmod +x lethean/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/ + +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/ + +ci-macos-amd64-release: static-release ci-package-linux ## Build lethean-macos-amd64-cli.tar.bz2 + @tar -cjvf lethean-macos-amd64-cli.tar.bz2 lethean/ + +ci-macos-arm64-release: static-release ci-package-linux ## Build lethean-macos-arm64-cli.tar.bz2 + @tar -cjvf lethean-macos-arm64-cli.tar.bz2 lethean/ + +ci-linux-amd64-testnet: static-release-testnet ci-package-linux ## Build testnet-lethean-linux-amd64-cli.tar.bz2 @tar -cjvf testnet-lethean-linux-amd64-cli.tar.bz2 lethean/ - @rm -rf lethean + +ci-macos-amd64-testnet: static-release-testnet ci-package-linux ## Build testnet-lethean-macos-amd64-cli.tar.bz2 + @tar -cjvf testnet-lethean-macos-amd64-cli.tar.bz2 lethean/ + +ci-macos-arm64-testnet: static-release-testnet ci-package-linux ## Build testnet-lethean-macos-arm64-cli.tar.bz2 + @tar -cjvf testnet-lethean-macos-arm64-cli.tar.bz2 lethean/ conan: @conan config install contrib/cmake/settings_user.yml diff --git a/build/settings_user.yml b/build/settings_user.yml index 64e55a12..8767fdbb 100644 --- a/build/settings_user.yml +++ b/build/settings_user.yml @@ -2,4 +2,4 @@ compiler: gcc: version: ["11.4.0"] apple-clang: - version: ["15.0.0.15000040"] \ No newline at end of file + version: ["15.0.0.15000040", "15.0.0.15000309"] \ No newline at end of file