Skip to content

Commit 7b4a57c

Browse files
committed
W601-014 Avoid TRAVIS_TAG usage.
We don't use Travis CI any more, so ALS version isn't set. In GitHub CI script let's use a tag instead.
1 parent 534d038 commit 7b4a57c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/build-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ make -C subprojects/templates-parser setup prefix=$prefix \
7979
ENABLE_SHARED=no \
8080
${DEBUG:+BUILD=debug} build-static install-static
8181

82-
make LIBRARY_TYPE=static all check
82+
make LIBRARY_TYPE=static VERSION=$TAG all check
8383

8484
function fix_rpath ()
8585
{

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Server executable file:
22
ROOTDIR=$(shell pwd)
33

4+
# ALS version
5+
VERSION ?=
46
# Location of home dir for tests
57
export ALS_HOME=$(ROOTDIR)/testsuite
68

@@ -74,10 +76,10 @@ all: coverage-instrument
7476
$(GPRBUILD) -P gnat/tester.gpr -p $(BUILD_FLAGS)
7577
$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb
7678
$(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \
77-
-XVERSION=$(TRAVIS_TAG)
79+
-XVERSION=$(VERSION)
7880
$(GPRBUILD) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS)
7981
$(GPRBUILD) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS) \
80-
-XVERSION=$(TRAVIS_TAG)
82+
-XVERSION=$(VERSION)
8183
mkdir -p integration/vscode/ada/$(PLATFORM)
8284
cp -f $(ALS)$(EXE) integration/vscode/ada/$(PLATFORM)
8385

@@ -92,7 +94,7 @@ ifneq ($(COVERAGE),)
9294
# Remove artifacts from previous instrumentations, so that stale units that
9395
# are not overriden by new ones don't get in our way.
9496
rm -rf .obj/*/gnatcov-instr
95-
$(COVERAGE_INSTR) -XVERSION=$(TRAVIS_TAG) \
97+
$(COVERAGE_INSTR) -XVERSION=$(VERSION) \
9698
-Pgnat/lsp_server.gpr --projects lsp_server --projects lsp
9799
$(COVERAGE_INSTR) -Pgnat/tester.gpr --projects lsp
98100
$(COVERAGE_INSTR) -Pgnat/codec_test.gpr --projects lsp

0 commit comments

Comments
 (0)