Skip to content

Commit 13959f6

Browse files
committed
Rename release archive to include version and product name.
Also * use Alire 2.0.2 * fix `pip install` error on istalling libadalang dependencies. Refs * #1212 * #1213 Fixes ada_language_server#1471
1 parent 1ff37a0 commit 13959f6

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.github/workflows/build-binaries.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,16 @@ jobs:
4343
- name: Get GNAT toolchain with alire
4444
shell: bash
4545
run: |
46-
# alire-project/setup-alire doesn't work for ARM64 Mac OS X for now.
47-
# https://github.com/alire-project/setup-alire/pull/74
48-
# Also it depends on `engineerd/configurator@v0.0.10` not approved by IT.
49-
# https://github.com/alire-project/setup-alire/issues/75
50-
# So we fetch Alire with curl then toolchain with Alire.
46+
# alire-project/setup-alire works for ARM64 Mac OS X now. Shall we use it?
5147
if [[ "$RUNNER_ARCH" == ARM64 ]] ; then
52-
ZIP=nightly/alr-nightly-bin-aarch64-macos.zip
48+
ZIP=v2.0.2/alr-2.0.2-bin-aarch64-${RUNNER_OS}.zip
5349
else
54-
ZIP=v2.0.1/alr-2.0.1-bin-x86_64-${RUNNER_OS}.zip
50+
ZIP=v2.0.2/alr-2.0.2-bin-x86_64-${RUNNER_OS}.zip
5551
fi
5652
curl -L -O https://github.com/alire-project/alire/releases/download/$ZIP
5753
unzip $(basename $ZIP)
5854
bin/alr index --reset-community
59-
bin/alr toolchain --select gnat_native^14 gprbuild
55+
bin/alr toolchain --select gnat_native gprbuild
6056
echo $PWD/bin >> $GITHUB_PATH
6157
- name: Get cross GNAT toolchain (Linux)
6258
if: ${{ runner.os == 'Linux' }}

.github/workflows/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ if [[ -z "$NODE_ARCH_PLATFORM" ]]; then
1414
NODE_PLATFORM=$(node -e "console.log(process.platform)")
1515
NODE_ARCH=$(node -e "console.log(process.arch)")
1616
NODE_ARCH_PLATFORM=$NODE_ARCH/$NODE_PLATFORM
17-
NAME=$NODE_ARCH-$NODE_PLATFORM
17+
NAME=als-$TAG-$NODE_PLATFORM-$NODE_ARCH
1818
else
19-
NAME=${NODE_ARCH_PLATFORM%/*}-${NODE_ARCH_PLATFORM#*/}
19+
NAME=als-$TAG-${NODE_ARCH_PLATFORM#*/}-${NODE_ARCH_PLATFORM%/*}
2020
fi
2121

2222
function release_notes() {

subprojects/libadalang.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GPR_PROJECT_PATH.prepend = "${CRATE_ROOT}/build"
1414

1515
[[actions]]
1616
type = "pre-build"
17-
command = ["bash", "-c", "-x", "source setenv.sh; pip install -r REQUIREMENTS.dev; python manage.py generate"]
17+
command = ["bash", "-c", "-x", "source setenv.sh; pip install -rrequirements-{github,pypi}.txt && python manage.py generate"]
1818

1919
[[depends-on]]
2020
gnatcoll = "^24"

0 commit comments

Comments
 (0)