diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 2828988..80ce069 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -29,7 +29,7 @@ jobs: run: mvn test - name: Upload JAR artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: java-client-jar path: target/*.jar @@ -65,7 +65,7 @@ jobs: run: cargo test - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: rust-server-binary path: mock-trading-server/target/release/mock-trading-server @@ -98,7 +98,7 @@ jobs: run: cmake --build build --config Release - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cpp-client-linux-binary path: cpp-client/build/* @@ -123,27 +123,35 @@ jobs: .\bootstrap-vcpkg.bat .\vcpkg integrate install - - name: Install dependencies (static) + - name: Install dependencies run: | cd ../vcpkg - .\vcpkg install openssl:x64-windows-static zlib:x64-windows-static + .\vcpkg install openssl:x64-windows zlib:x64-windows - name: Configure CMake shell: bash run: | cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DVCPKG_TARGET_TRIPLET=x64-windows-static + -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake - - name: Build (static linking) + - name: Build run: cmake --build build --config Release + - name: Copy DLLs + shell: bash + run: | + cp ../vcpkg/installed/x64-windows/bin/libssl-3-x64.dll build/Release/ + cp ../vcpkg/installed/x64-windows/bin/libcrypto-3-x64.dll build/Release/ + cp "C:/Windows/System32/msvcp140.dll" build/Release/ || true + cp "C:/Windows/System32/vcruntime140.dll" build/Release/ || true + cp "C:/Windows/System32/vcruntime140_1.dll" build/Release/ || true + - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cpp-client-windows-binary - path: cpp-client/build/Release/hft_client.exe + path: cpp-client/build/Release/*.dll cpp-client/build/Release/*.exe retention-days: 7 cdk-infrastructure: @@ -177,7 +185,7 @@ jobs: run: npx cdk synth - name: Upload CDK template - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cdk-template path: deployment/cdk/cdk.out diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01441ac..e72a941 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: cp "$JAR_FILE" ExchangeFlow-${{ steps.get_version.outputs.VERSION }}.jar - name: Upload JAR - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: java-jar path: ExchangeFlow-${{ steps.get_version.outputs.VERSION }}.jar @@ -110,7 +110,7 @@ jobs: strip mock-trading-server-${{ steps.get_version.outputs.VERSION }}-${SUFFIX} || true - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: rust-${{ matrix.target }} path: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-* @@ -150,7 +150,7 @@ jobs: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-${SUFFIX} - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: rust-${{ matrix.target }} path: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-* @@ -181,7 +181,7 @@ jobs: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.exe - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: rust-windows path: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.exe @@ -232,7 +232,7 @@ jobs: ' - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cpp-linux-${{ matrix.arch }} path: cpp-client-${{ steps.get_version.outputs.VERSION }}-linux-${{ matrix.arch }}.tar.gz @@ -276,7 +276,7 @@ jobs: tar -czf ../../cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-${{ matrix.arch }}.tar.gz hft_client - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cpp-macos-${{ matrix.arch }} path: cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-${{ matrix.arch }}.tar.gz @@ -332,7 +332,7 @@ jobs: 7z a ../../../cpp-client-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.zip *.exe *.dll - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: cpp-windows-x86_64 path: cpp-client-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.zip