diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d29f54b..5cf9c93 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -17,8 +17,15 @@ jobs: with: fetch-depth: 0 - - name: Setup MSBuild.exe - uses: warrenbuckley/Setup-MSBuild@v1 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Install Boost + shell: cmd + run: | + choco install wget --no-progress + wget -nv -O boost-installer.exe "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe/download" + boost-installer.exe /dir=%BOOST_ROOT% /sp- /verysilent /suppressmsgboxes /norestart - name: Install OpenSSL run: choco install openssl @@ -26,7 +33,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.14.0' + version: '5.15.1' host: 'windows' target: 'desktop' modules: 'qttools5' @@ -36,8 +43,8 @@ jobs: shell: powershell id: build env: - BOOST_ROOT: ${{ env.BOOST_ROOT }} GIT_REDIRECT_STDERR: '2>&1' + VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\' run: | $build_folder = "build" $krb_ver = git describe --tags --abbrev=0 @@ -48,7 +55,7 @@ jobs: git clone https://github.com/seredat/karbowanec.git cryptonote --quiet mkdir "$build_folder" cd "$build_folder" - Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT_1_69_0"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait + Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT"" -DBOOST_INCLUDE_DIRS=""$env:BOOST_ROOT/include"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait Start-Process msbuild -ArgumentList "KarboLite.sln","/p:Configuration=Release" -NoNewWindow -Wait $build_path = "./$build_folder" echo "::set-output name=build_path::${build_path}" @@ -99,18 +106,23 @@ jobs: with: fetch-depth: 0 - - name: Setup Xcode - uses: maxim-lobanov/setup-xcode@1.0 - with: - xcode-version: '10' - - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.0' + version: '5.15.2' modules: 'qttools5' install-deps: 'true' + - name: Setup Xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest-stable + + - name: Install other deps + run: | + brew install gcc boost openssl + brew link boost --force + - name: Find Tag id: tagger uses: jimschubert/query-tag-action@v1 @@ -133,7 +145,7 @@ jobs: git clone https://github.com/seredat/karbowanec.git cryptonote mkdir -p "$build_folder" cd "$build_folder" - cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -D CMAKE_BUILD_TYPE=Release ../.. + cmake -D ARCH=default -D CMAKE_C_FLAGS="-mmacosx-version-min=10.12" -D CMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -D CMAKE_BUILD_TYPE=Release ../.. make macdeployqt "$app_name" cpack @@ -144,6 +156,8 @@ jobs: echo "::set-output name=release_name::${release_name}.zip" echo "::set-output name=asset_path::${asset_path}" echo "::set-output name=krb_ver::${krb_ver}" + env: + MACOSX_DEPLOYMENT_TARGET: '10.12' - name: Create Artifact uses: actions/upload-artifact@v1.0.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89f5a62..492fcf0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,8 +14,15 @@ jobs: with: fetch-depth: 0 - - name: Setup MSBuild.exe - uses: warrenbuckley/Setup-MSBuild@v1 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Install Boost + shell: cmd + run: | + choco install wget --no-progress + wget -nv -O boost-installer.exe "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe/download" + boost-installer.exe /dir=%BOOST_ROOT% /sp- /verysilent /suppressmsgboxes /norestart - name: Install OpenSSL run: choco install openssl @@ -23,7 +30,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.14.0' + version: '5.15.2' host: 'windows' target: 'desktop' modules: 'qttools5' @@ -33,8 +40,8 @@ jobs: shell: powershell id: build env: - BOOST_ROOT: ${{ env.BOOST_ROOT }} GIT_REDIRECT_STDERR: '2>&1' + VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\' run: | $build_folder = "build" $krb_ver = "${{ github.ref }}" -replace '[refs/tags/]' @@ -45,7 +52,7 @@ jobs: git clone https://github.com/seredat/karbowanec.git cryptonote --quiet mkdir "$build_folder" cd "$build_folder" - Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT_1_69_0"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait + Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT"" -DBOOST_INCLUDE_DIRS=""$env:BOOST_ROOT/include"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait Start-Process msbuild -ArgumentList "KarboLite.sln","/p:Configuration=Release" -NoNewWindow -Wait $build_path = "./$build_folder" echo "::set-output name=build_path::${build_path}" @@ -99,18 +106,23 @@ jobs: with: fetch-depth: 0 - - name: Setup Xcode - uses: maxim-lobanov/setup-xcode@1.0 - with: - xcode-version: '10' - - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.0' + version: '5.15.2' modules: 'qttools5' install-deps: 'true' + - name: Setup Xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest-stable + + - name: Install other deps + run: | + brew install gcc boost openssl + brew link boost --force + - name: Build id: build run: | @@ -135,6 +147,8 @@ jobs: echo "::set-output name=release_name::${release_name}.zip" echo "::set-output name=asset_path::${asset_path}" echo "::set-output name=krb_ver::${krb_ver}" + env: + MACOSX_DEPLOYMENT_TARGET: '10.12' - name: Create Release uses: softprops/action-gh-release@v1