Skip to content

Commit

Permalink
Update build scripts and core with fresh checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
aivve committed Dec 1, 2020
1 parent ae35e4c commit 97c4752
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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'

Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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/[email protected]
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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'

Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cryptonote

0 comments on commit 97c4752

Please sign in to comment.