From 73177962b14245d873b37624f51cb90be5681ed8 Mon Sep 17 00:00:00 2001
From: Maxim Reznik <reznikmm@gmail.com>
Date: Mon, 21 Oct 2024 13:37:20 +0300
Subject: [PATCH] Rename release archive to include version and product name.

Also
* use Alire 2.0.2
* fix `pip install` error on istalling libadalang dependencies.

Refs
* https://github.com/AdaCore/ada_language_server/issues/1212
* https://github.com/AdaCore/ada_language_server/issues/1213

Fixes ada_language_server#1471
---
 .github/workflows/build-binaries.yml | 12 ++++--------
 .github/workflows/release.sh         |  4 ++--
 subprojects/libadalang.toml          |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index ab27c5aa0..cc3ea8277 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -43,20 +43,16 @@ jobs:
       - name: Get GNAT toolchain with alire
         shell: bash
         run: |
-          # alire-project/setup-alire doesn't work for ARM64 Mac OS X for now.
-          # https://github.com/alire-project/setup-alire/pull/74
-          # Also it depends on `engineerd/configurator@v0.0.10` not approved by IT.
-          # https://github.com/alire-project/setup-alire/issues/75
-          # So we fetch Alire with curl then toolchain with Alire.
+          # alire-project/setup-alire works for ARM64 Mac OS X now. Shall we use it?
           if [[ "$RUNNER_ARCH" == ARM64 ]] ; then
-            ZIP=nightly/alr-nightly-bin-aarch64-macos.zip
+            ZIP=v2.0.2/alr-2.0.2-bin-aarch64-${RUNNER_OS}.zip
           else
-            ZIP=v2.0.1/alr-2.0.1-bin-x86_64-${RUNNER_OS}.zip
+            ZIP=v2.0.2/alr-2.0.2-bin-x86_64-${RUNNER_OS}.zip
           fi
           curl -L -O https://github.com/alire-project/alire/releases/download/$ZIP
           unzip $(basename $ZIP)
           bin/alr index --reset-community
-          bin/alr toolchain --select gnat_native^14 gprbuild
+          bin/alr toolchain --select gnat_native gprbuild
           echo $PWD/bin >> $GITHUB_PATH
       - name: Get cross GNAT toolchain (Linux)
         if: ${{ runner.os == 'Linux' }}
diff --git a/.github/workflows/release.sh b/.github/workflows/release.sh
index 8767a84ed..e596609c5 100755
--- a/.github/workflows/release.sh
+++ b/.github/workflows/release.sh
@@ -14,9 +14,9 @@ if [[ -z "$NODE_ARCH_PLATFORM" ]]; then
    NODE_PLATFORM=$(node -e "console.log(process.platform)")
    NODE_ARCH=$(node -e "console.log(process.arch)")
    NODE_ARCH_PLATFORM=$NODE_ARCH/$NODE_PLATFORM
-   NAME=$NODE_ARCH-$NODE_PLATFORM
+   NAME=als-$TAG-$NODE_PLATFORM-$NODE_ARCH
 else
-   NAME=${NODE_ARCH_PLATFORM%/*}-${NODE_ARCH_PLATFORM#*/}
+   NAME=als-$TAG-${NODE_ARCH_PLATFORM#*/}-${NODE_ARCH_PLATFORM%/*}
 fi
 
 function release_notes() {
diff --git a/subprojects/libadalang.toml b/subprojects/libadalang.toml
index f93fe0548..a375057df 100644
--- a/subprojects/libadalang.toml
+++ b/subprojects/libadalang.toml
@@ -14,7 +14,7 @@ GPR_PROJECT_PATH.prepend = "${CRATE_ROOT}/build"
 
 [[actions]]
 type = "pre-build"
-command = ["bash", "-c", "-x", "source setenv.sh; pip install -r REQUIREMENTS.dev; python manage.py generate"]
+command = ["bash", "-c", "-x", "source setenv.sh; pip install -rrequirements-{github,pypi}.txt && python manage.py generate"]
 
 [[depends-on]]
 gnatcoll = "^24"