Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync dev #6

Merged
merged 21 commits into from
Mar 28, 2022
+11 −6
Merged

sync dev #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a1693bb
update version
smk762 Mar 18, 2022
cbe0651
Merge pull request #1686 from KomodoPlatform/CI-VT-update
Mar 21, 2022
0b2289c
extra config flags
smk762 Mar 22, 2022
43115c6
revert
smk762 Mar 22, 2022
df65ba3
Update osx_script.sh
smk762 Mar 25, 2022
01cc8b0
Update osx_script.sh
smk762 Mar 25, 2022
7f0476d
Update linux_script.sh
smk762 Mar 25, 2022
4634085
use macos-10.15
smk762 Mar 25, 2022
0d90790
change deployment target and use KP fork
smk762 Mar 25, 2022
5e66a75
use KP fork
smk762 Mar 25, 2022
89ff52f
latest setup python
smk762 Mar 25, 2022
1317666
try older aqt / py7zr versions in macos
smk762 Mar 25, 2022
83fee8d
use macos-10.15, dont setup python on macos
smk762 Mar 25, 2022
abffa5a
try python 3.9
smk762 Mar 25, 2022
e06a871
older brew
smk762 Mar 25, 2022
8575854
use mac-latest
smk762 Mar 25, 2022
5507a25
test ubuntu old forked libwally
smk762 Mar 25, 2022
a2c1485
clean up
smk762 Mar 25, 2022
1f523aa
rm whitespace
smk762 Mar 25, 2022
8869d04
Merge pull request #1692 from KomodoPlatform/CI_libtool_test
Milerius Mar 26, 2022
d273b47
Merge pull request #1693 from KomodoPlatform/dev
Milerius Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/atomicdex-desktop-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,17 @@ jobs:
submodules: 'true'
- run: git submodule update --init --recursive


- uses: actions/setup-python@v2
- name: Setup Python
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.9'

- name: Install QT (Linux)
if: runner.os == 'Linux'
uses: KomodoPlatform/install-qt-action@v2.14.0
with:
version: ${{ matrix.qt }}
setup-python: 'false'
host: 'linux'
target: 'desktop'
dir: '${{ github.workspace }}'
Expand All @@ -80,6 +81,7 @@ jobs:
uses: KomodoPlatform/install-qt-action@v2.14.0
with:
version: ${{ matrix.qt }}
setup-python: 'false'
host: 'mac'
target: 'desktop'
dir: '${{ github.workspace }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/atomicdex-desktop-release-vt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
-
name: VirusTotal Scan
uses: crazy-max/ghaction-virustotal@v2.2.1
uses: crazy-max/ghaction-virustotal@v2.4.1
with:
vt_api_key: ${{ secrets.VT_API_KEY }}
github_token: ${{ github.token }}
Expand All @@ -20,4 +20,4 @@ jobs:
.zip$
.tar.zst$
.dmg$
.7z$
.7z$
5 changes: 4 additions & 1 deletion ci_tools_atomic_dex/ci_scripts/osx_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ brew update
brew tap-new $USER/local-nim
brew extract --version=1.4.8 nim $USER/local-nim

brew unlink libtool
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
brew install libtool.rb

brew install autoconf \
automake \
libtool \
pkgconfig \
wget \
nim@1.4.8 \
Expand Down