Skip to content

Commit 0e1f8f7

Browse files
committed
VB28-039 Update Ubuntu and Mac OS X on GitHub CI
because they are deprecated. Drop `libgpr2` building, because `libgpr2` is deployed with `libadalang` binaries as a dependency.
1 parent 409f4c4 commit 0e1f8f7

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

.github/workflows/build-binaries.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,6 @@ else
5757
export BUILD_MODE=prod
5858
fi
5959

60-
pip install --user subprojects/langkit/
61-
62-
# Python used in GitHub CI on Windows can't understand
63-
# make's notation of absolute path in form of /d/PATH,
64-
# where /d is drive D: Let's use relative path instead
65-
sed -i -e '/langkit/s/.{CURDIR}/../' subprojects/gpr/Makefile
66-
67-
make -C subprojects/gpr setup prefix=$prefix \
68-
GPR2KBDIR=./gprconfig_kb/db ENABLE_SHARED=no \
69-
${DEBUG:+BUILD=debug} build-lib-static install-lib-static
70-
7160
make -C subprojects/templates-parser setup prefix=$prefix \
7261
ENABLE_SHARED=no \
7362
${DEBUG:+BUILD=debug} build-static install-static

.github/workflows/build-binaries.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix: # Build debug and production
1818
debug: ['', 'debug'] # '' if production, 'debug' for debug
19-
os: [macos-10.15, ubuntu-18.04, windows-latest]
19+
os: [macos-11, ubuntu-20.04, windows-latest]
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Setup Python 3.8
@@ -65,22 +65,6 @@ jobs:
6565
with:
6666
repository: AdaCore/templates-parser
6767
path: subprojects/templates-parser
68-
- name: Get Langkit
69-
uses: actions/checkout@v2
70-
with:
71-
repository: AdaCore/langkit
72-
path: subprojects/langkit
73-
- name: Get gpr
74-
uses: actions/checkout@v2
75-
with:
76-
repository: AdaCore/gpr
77-
path: subprojects/gpr
78-
ref: edge
79-
- name: Get gprconfig_kb
80-
uses: actions/checkout@v2
81-
with:
82-
repository: AdaCore/gprconfig_kb
83-
path: subprojects/gpr/gprconfig_kb
8468
- name: Get GNATdoc
8569
uses: actions/checkout@v2
8670
with:

0 commit comments

Comments
 (0)