From eadf6ebfec2615530e1e2d168405568b21081297 Mon Sep 17 00:00:00 2001 From: Snider Date: Wed, 1 Oct 2025 23:52:43 +0100 Subject: [PATCH] Refactor CI workflows and build process Enable Conan package caching and remove redundant doc build steps from all platform workflows. Update Makefile to ensure docs are built as part of the release target. Clean up MSVC runtime variable logic in conanfile.py and adjust Docker workflow runner and build args. --- .github/workflows/build-docker.yml | 4 +--- .github/workflows/build-linux-arm64.yml | 5 +---- .github/workflows/build-linux-intel.yml | 5 +---- .github/workflows/build-macos-arm64.yml | 5 +---- .github/workflows/build-macos-intel.yml | 5 +---- .github/workflows/build-windows-intel.yml | 5 +---- Makefile | 2 +- conanfile.py | 6 ------ 8 files changed, 7 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 067827a9..25c9308e 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -18,7 +18,7 @@ on: jobs: build: name: "lthn/chain:${{ inputs.chain-network == 'testnet' && 'testnet' || 'latest' }}" - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-24.04 steps: - name: Checkout Project uses: actions/checkout@v4.2.2 @@ -48,7 +48,6 @@ jobs: build-args: | BUILD_TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} BUILD_THREADS=2 - BUILD_LOCAL=1 target: builder tags: lthn/chain:${{ inputs.chain-network == 'testnet' && 'testnet' || 'latest' }} cache-from: type=registry,ref=lthn/chain:buildcache @@ -65,7 +64,6 @@ jobs: build-args: | BUILD_TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} BUILD_THREADS=2 - BUILD_LOCAL=1 tags: lthn/chain:${{ inputs.chain-network == 'testnet' && 'testnet' || 'latest' }} cache-from: type=registry,ref=lthn/chain:buildcache diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index 49756389..46801222 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -41,10 +41,7 @@ jobs: uses: conan-io/setup-conan@v1 with: home: ${{ github.workspace }}/build/sdk - cache_packages: false - - - name: Compile Docs - run: make docs + cache_packages: true - name: Compile Release run: make release CPU_CORES=4 TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} diff --git a/.github/workflows/build-linux-intel.yml b/.github/workflows/build-linux-intel.yml index 6efa27be..c0a30383 100644 --- a/.github/workflows/build-linux-intel.yml +++ b/.github/workflows/build-linux-intel.yml @@ -39,10 +39,7 @@ jobs: uses: conan-io/setup-conan@v1 with: home: ${{ github.workspace }}/build/sdk - cache_packages: false - - - name: Compile Docs - run: make docs + cache_packages: true - name: Compile Release run: make release CPU_CORES=4 TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} diff --git a/.github/workflows/build-macos-arm64.yml b/.github/workflows/build-macos-arm64.yml index 27b9a6ff..75c073f2 100644 --- a/.github/workflows/build-macos-arm64.yml +++ b/.github/workflows/build-macos-arm64.yml @@ -39,10 +39,7 @@ jobs: uses: conan-io/setup-conan@v1 with: home: ${{ github.workspace }}/build/sdk - cache_packages: false - - - name: Compile Docs - run: make docs + cache_packages: true # - name: Compile Release # run: make apple-clang-armv8 TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} diff --git a/.github/workflows/build-macos-intel.yml b/.github/workflows/build-macos-intel.yml index 7b586bcf..5cab7b47 100644 --- a/.github/workflows/build-macos-intel.yml +++ b/.github/workflows/build-macos-intel.yml @@ -37,10 +37,7 @@ jobs: uses: conan-io/setup-conan@v1 with: home: ${{ github.workspace }}/build/sdk - cache_packages: false - - - name: Compile Docs - run: make docs + cache_packages: true - name: Compile Release run: make release CPU_CORES=4 TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} diff --git a/.github/workflows/build-windows-intel.yml b/.github/workflows/build-windows-intel.yml index 6808bba5..fdfb9e09 100644 --- a/.github/workflows/build-windows-intel.yml +++ b/.github/workflows/build-windows-intel.yml @@ -36,10 +36,7 @@ jobs: uses: conan-io/setup-conan@v1 with: home: ${{ github.workspace }}/build/sdk - cache_packages: false - - - name: Compile Docs - run: make docs + cache_packages: true - name: Compile Release run: make release STATIC=1 CPU_CORES=4 TESTNET=${{ inputs.chain-network == 'testnet' && '1' || '0' }} diff --git a/Makefile b/Makefile index 9e1a1885..4edf4122 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ endif all: help -release: build +release: docs build (cd $(BUILD_FOLDER) && cpack) build: configure diff --git a/conanfile.py b/conanfile.py index ac4c1ec5..efed9a7b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,12 +33,6 @@ class BlockchainConan(ConanFile): tc.variables["TESTNET"] = self.options.testnet # tc.preprocessor_definitions["TESTNET"] = None # tc.variables["BUILD_VERSION"] = self.options.build_version - if self.settings.get_safe("compiler") == "msvc": - if self.options.static: - tc.variables["CMAKE_MSVC_RUNTIME_LIBRARY"] = "MultiThreaded$<$:Debug>" - else: - tc.variables["CMAKE_MSVC_RUNTIME_LIBRARY"] = "MultiThreadedDLL$<$:Debug>" - tc.generate() deps = CMakeDeps(self)