Skip to content

Commit

Permalink
Merge branch 'topic/fix_github_ci' into 'master'
Browse files Browse the repository at this point in the history
Fix GitHub CI after introduction prettier-ada library

See merge request eng/libadalang/libadalang!1539
  • Loading branch information
reznikmm committed Feb 18, 2024
2 parents 821a3c2 + c7249da commit 00a4251
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ jobs:
with:
repository: AdaCore/AdaSAT
path: langkit/langkit/adasat
- name: Get prettier-ada
uses: actions/checkout@v3
with:
repository: AdaCore/prettier-ada
path: prettier-ada
- name: Get VSS
uses: actions/checkout@v3
with:
repository: reznikmm/VSS
path: VSS
- name: Try to checkout langkit's branch
shell: bash
run: (cd langkit; git checkout ${{ github.ref }} || true)
Expand Down
7 changes: 7 additions & 0 deletions utils/gh-build-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,18 @@ build_archive()
python gnatcoll-bindings/gmp/setup.py install

BUILD=${DEBUG:+dev} # Convert debug to dev
VSS_BUILD=${DEBUG:+development} # Convert debug to development

make -C VSS build-libs-$LIBRARY_TYPE install-libs-$LIBRARY_TYPE PREFIX=$prefix \
BUILD_PROFILE=${VSS_BUILD:-release} GPRFLAGS=$TARGET_OPTION

sed -i -e 's/, "-flto"//' langkit/langkit/adasat/adasat.gpr # LTO fails on GNAT from Alire
gprbuild -p -P langkit/langkit/adasat/adasat.gpr -XLIBRARY_TYPE=$LIBRARY_TYPE -XBUILD_MODE=${BUILD:-prod} $TARGET_OPTION
gprinstall -p -P langkit/langkit/adasat/adasat.gpr -XLIBRARY_TYPE=$LIBRARY_TYPE -XBUILD_MODE=${BUILD:-prod} --prefix=$prefix

gprbuild -p -P prettier-ada/prettier_ada.gpr -XLIBRARY_TYPE=$LIBRARY_TYPE -XBUILD_MODE=${BUILD:-prod} $TARGET_OPTION
gprinstall -p -P prettier-ada/prettier_ada.gpr -XLIBRARY_TYPE=$LIBRARY_TYPE -XBUILD_MODE=${BUILD:-prod} --prefix=$prefix

langkit/manage.py build-langkit-support --library-types=$LIBRARY_TYPE --build-mode ${BUILD:-prod} --gargs="$TARGET_OPTION"
langkit/manage.py install-langkit-support $prefix --library-types=$LIBRARY_TYPE --build-mode ${BUILD:-prod}

Expand Down

0 comments on commit 00a4251

Please sign in to comment.