From c7249da1ac7687925d5be2e372cf6d384ff60c26 Mon Sep 17 00:00:00 2001 From: Maxim Reznik Date: Fri, 16 Feb 2024 19:52:39 +0200 Subject: [PATCH] Fix GitHub CI after introduction prettier-ada library Refs #1271 --- .github/workflows/build-binaries.yml | 10 ++++++++++ utils/gh-build-binaries.sh | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 82effe6b7..d7690a1ae 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -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) diff --git a/utils/gh-build-binaries.sh b/utils/gh-build-binaries.sh index 84d290af9..68fec803c 100755 --- a/utils/gh-build-binaries.sh +++ b/utils/gh-build-binaries.sh @@ -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}