Skip to content

Commit

Permalink
Rename release archive to include version and product name.
Browse files Browse the repository at this point in the history
Also
* use Alire 2.0.2
* fix `pip install` error on istalling libadalang dependencies.

Refs
* AdaCore#1212
* AdaCore#1213

Fixes ada_language_server#1471
  • Loading branch information
reznikmm committed Oct 21, 2024
1 parent ceb6f72 commit 7317796
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]` 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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/libadalang.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7317796

Please sign in to comment.