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.

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

Use ubuntu 22.04, removed support for OCI distribution of ACE/TAO #13

Merged
merged 10 commits into from
Oct 6, 2023

Conversation

jwillemsen
Copy link
Member

* .github/workflows/matrix.yml:
* matrix.py:

    * .github/workflows/matrix.yml:
    * matrix.py:
    * .github/workflows/matrix.yml:
    * README.md:
    * matrix.py:
    * .github/workflows/matrix.yml:
    * configure.sh:
    * default.settings.sh:
    * get_ace_tao.sh:
    * setenv.sh:
@jwillemsen jwillemsen changed the title To Ubuntu 22.04 using matrix.py Use ubuntu 22.04, removed support for OCI distribution of ACE/TAO Oct 5, 2023
    * .github/workflows/matrix.yml:
    * README.md:
    * matrix.py:
matrix.py Outdated
Comment on lines 29 to 34
Ndk('r22b', 19, 30)
Ndk('r21e', 19, 29)
Ndk("r20b", 19, 29)
Ndk("r19c", 19, 28)
Ndk('r18b', 19, 28)
Ndk('r12b', 19, 24)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't have had to do this as these NDKs do support 16. r24 and later are the ones that require at least 19. The reason it was saying that it didn't support 16 is the newer Ubuntu image is including its own Android NDK which is overriding the scripts NDK.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The underlying issue is still there. It either has to unset ANDROID_NDK before running the scripts or probably easier to rename the ANDROID_NDK variables to something like OPENDDS_ANDROID_NDK.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed to OPENDDS_ANDROID_NDK

    * .github/workflows/matrix.yml:
    * README.md:
    * matrix.py:
    * build_xerces.sh:
    * configure.sh:
    * get_toolchain.sh:
    * setenv.sh:
    * .github/workflows/matrix.yml:
    * README.md:
    * matrix.py:
@jwillemsen
Copy link
Member Author

Looks your proposal fixed a lot of the failing checks. Maybe merge this one and when someone has spare time look at the 4 remaining failing checks?

matrix.py Show resolved Hide resolved
@iguessthislldo iguessthislldo merged commit b6dd48f into OpenDDS:master Oct 6, 2023
40 of 44 checks passed
@jwillemsen jwillemsen deleted the jwi-ub22 branch October 6, 2023 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants