diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 627729636..4937cca26 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -90,7 +90,6 @@ jobs: with: path: ${{ steps.build.outputs.asset_path_archive }} name: ${{ steps.build.outputs.release_name_archive }} - env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -113,7 +112,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.9' + version: '5.12.2' modules: 'qttools5' install-deps: 'true' @@ -122,7 +121,7 @@ jobs: with: xcode-version: '10' - - name: Install deps + - name: Install other deps run: | brew install gcc boost brew link boost --force @@ -148,7 +147,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 mkdir "$app_name$lang_folder" cp languages/*.qm "$app_name$lang_folder" @@ -161,6 +160,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 353157464..3d282f291 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: git clone https://github.com/seredat/karbowanec cryptonote --quiet mkdir "$build_folder" cd "$build_folder" - Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT_1_72_0"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait + Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT_1_72_0"" -G ""Visual Studio 16 2019"" -A x64 -DARCH=default",".." -NoNewWindow -Wait Start-Process msbuild -ArgumentList "KarbowanecWallet.sln","/p:Configuration=Release" -NoNewWindow -Wait $build_path = "./$build_folder" echo "::set-output name=build_path::${build_path}" @@ -128,7 +128,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.9' + version: '5.12.2' modules: 'qttools5' install-deps: 'true' @@ -137,7 +137,7 @@ jobs: with: xcode-version: '10' - - name: Install deps + - name: Install other deps run: | brew install gcc boost brew link boost --force @@ -154,7 +154,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 mkdir "$app_name$lang_folder" cp languages/*.qm "$app_name$lang_folder" @@ -167,6 +167,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 diff --git a/cryptonote b/cryptonote index 61ddd90fb..2a8347807 160000 --- a/cryptonote +++ b/cryptonote @@ -1 +1 @@ -Subproject commit 61ddd90fb7f3e719b5fd7f2e6b00e1aa824ec105 +Subproject commit 2a83478075d4a415f2e492ed78d5432f0e04ed22