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

Merge from Stable to Master #424

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open

Merge from Stable to Master #424

wants to merge 63 commits into from

Conversation

WadeBarnes
Copy link
Member

No description provided.

Artemkaaas and others added 30 commits September 12, 2019 10:24
@Artemkaaas
Fully qualified DID support
f149cb9 
Signed-off-by: artem.ivanov <[email protected]>
Merge branch 'master' into feature/fully-qulified-did
ae42252
@Artemkaaas
Fixed strange warning
aed2469 
Signed-off-by: artem.ivanov <[email protected]>
@Artemkaaas
Merge remote-tracking branch 'origin/master' into feature/fully-qulif…
76b96ed 
…ied-did
@Artemkaaas
Debug android
425d647 
Signed-off-by: artem.ivanov <[email protected]>
@Artemkaaas
Merge branch 'master' into feature/fully-qulified-did
edb9254
@jovfer
Merge branch 'master' into feature/fully-qulified-did
3ef2328
@Artemkaaas
Bump Libindy version on stable
207a799 
Signed-off-by: artem.ivanov <[email protected]>
@Artemkaaas
Merge pull request #414 from Artemkaaas/sovotoken-1.0.3
86cffe9 
Sovotoken 1.0.3
@Artemkaaas
Fixed doc test
2e5842e 
Signed-off-by: artem.ivanov <[email protected]>
@Artemkaaas
Merge branch 'stable' into feature/fully-qulified-did
b78bcf7
@Artemkaaas
Merge pull request #408 from Artemkaaas/feature/fully-qulified-did
7958344 
Fully qualified DID support
@Artemkaaas
Updated toml file
9d8e8e7 
Signed-off-by: artem.ivanov <[email protected]>
@jovfer
Merge pull request #415 from Artemkaaas/bump-version
1c7ff32 
Updated toml file
Merge branch 'master' of github.com:sovrin-foundation/libsovtoken int…
af8445c 
…o stable
Release 1.0.5
1bb98d7 
Signed-off-by: Nikita Khateev <[email protected]>
Update libsodium path
7b39fca 
Signed-off-by: Nikita Khateev <[email protected]>
Merge pull request #421 from anikitinDSR/stable-1.0.5
4e464c6 
Stable 1.0.4
@Artemkaaas
Libsovtoken 1.0.5
eefe933 
Signed-off-by: artem.ivanov <[email protected]>
Merge pull request #422 from Artemkaaas/stable-1.0.5
e39929e 
Libsovtoken 1.0.5
@devinleighsmith
correct build/test errors.
01767c3 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #425 from devinleighsmith/stable
884ae68 
correct build/test errors.
@devinleighsmith
attempt to resolve aws jenkins build issues.
8836b60 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #426 from devinleighsmith/stable
d411c02 
attempt to resolve aws jenkins build issues.
@devinleighsmith
bump versions of dockerfile to trigger ci/cd build properly.
0be0c75 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #427 from devinleighsmith/stable
aed78ba 
bump versions of dockerfile to trigger ci/cd build properly.
@devinleighsmith
Bump dockerfiles to ensure images are run in AWS.
445721a 
Remove 32 bit target support for apple
update mac setup script based on indy-sdk mac setup script.

Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #428 from devinleighsmith/stable
2fb2bf0 
Bump dockerfiles to ensure images are run in AWS.
@devinleighsmith
update work_dir to resolve ios build errors.
1388302 
update android dockerfile version number.

Signed-off-by: Devin Smith <[email protected]>
@devinleighsmith
Merge branch 'stable' into stable
8a31d84
devinleighsmith and others added 13 commits May 3, 2021 09:10
@devinleighsmith
Prevent rustup update from being run before the target remove logic.
3882282 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #432 from devinleighsmith/stable
d88ba4e 
Prevent rustup update from being run before the target remove logic.
@devinleighsmith
Try specifying toolchain of removed components.
8dd5010 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #433 from devinleighsmith/stable
a551174 
Try specifying toolchain of removed components.
@devinleighsmith
Point to newer version of openssl within mac build scripts.
bbab088 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #434 from devinleighsmith/stable
fa30cae 
Point to newer version of openssl within mac build scripts.
@devinleighsmith
update libindy version to 1.16.0
7957f27 
Signed-off-by: Devin Smith <[email protected]>
@devinleighsmith
rollback version changes to support same versions as libindy.
c4f3e34 
Signed-off-by: Devin Smith <[email protected]>
@devinleighsmith
rollback libindy version bumps.
a73e03f 
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #435 from devinleighsmith/stable
986b85f 
update libindy version to 1.16.0
@ianco @devinleighsmith
Upgrade to indy-sdk 1.16 - fix compile errors and warnings
ec48aaa 
Signed-off-by: Ian Costanzo <[email protected]>
Signed-off-by: Devin Smith <[email protected]>
@ianco @devinleighsmith
Updat indy version in jenkins script
de27956 
Signed-off-by: Ian Costanzo <[email protected]>
Signed-off-by: Devin Smith <[email protected]>
@WadeBarnes
Merge pull request #438 from devinleighsmith/16.0
7aac753 
16.0
@devinleighsmith
Copy link

@mirgee This build consumes indy-sdk and is failing during its mac os build. This is the error:
ld: warning: ignoring file /usr/local/opt/[email protected]/lib/libssl.dylib, building for iOS-arm64 but attempting to link with file built for macOS-x86_64 ld: warning: ignoring file /usr/local/opt/[email protected]/lib/libcrypto.dylib, building for iOS-arm64 but attempting to link with file built for macOS-x86_64
based on your experience setting up the macosbuild for indy-sdk, does this error look familiar at all to you?

@devinleighsmith
Copy link

@mirgee This build consumes indy-sdk and is failing during its mac os build. This is the error:
ld: warning: ignoring file /usr/local/opt/[email protected]/lib/libssl.dylib, building for iOS-arm64 but attempting to link with file built for macOS-x86_64 ld: warning: ignoring file /usr/local/opt/[email protected]/lib/libcrypto.dylib, building for iOS-arm64 but attempting to link with file built for macOS-x86_64
based on your experience setting up the macosbuild for indy-sdk, does this error look familiar at all to you?

Oh, and just to be clear, I don't think there are any issues with indy-sdk that are causing this build failure. I'm just hoping your experience with getting the indy-sdk macos build to work may be relevant for my issue.

ianco and others added 6 commits May 27, 2021 16:11
@mirgee mirgee mentioned this pull request Jun 11, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@WadeBarnes @devinleighsmith @Artemkaaas @jovfer @ianco @mirgee