Skip to content

Commit 79b85b2

Browse files
committed
U922-009 Change toolchain to Alire GCC 11.
1 parent bdad0d7 commit 79b85b2

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

.github/workflows/main.yml

+19-20
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,32 @@ jobs:
1212
steps:
1313
- name: Get VSS
1414
uses: actions/checkout@v2
15+
with:
16+
path: ./vss
1517
- uses: actions/cache@v2
1618
with:
1719
path: ./cached_gnat
18-
key: ${{ runner.os }}-gnat-ce-2021
19-
restore-keys: ${{ runner.os }}-gnat-ce-2021
20-
- name: Get GNAT Community 2021 toolchain
21-
if: ${{ runner.os != 'macOS' }}
22-
uses: ada-actions/toolchain@ce2021
23-
with:
24-
distrib: community
25-
install_dir: ./cached_gnat
26-
- name: Get GNAT Community 2020 toolchain
27-
if: ${{ runner.os == 'macOS' }}
28-
uses: ada-actions/toolchain@ce2020
20+
key: ${{ runner.os }}-alire_v1
21+
restore-keys: ${{ runner.os }}-alire_v1
22+
- name: Get GNAT toolchain with alire
23+
uses: alire-project/setup-alire@v1
2924
with:
30-
distrib: community
31-
install_dir: ./cached_gnat
25+
toolchain: gnat_native^11 gprbuild^21
26+
toolchain_dir: ./cached_gnat
3227
- name: Get UCD.zip
3328
run: |
34-
curl -C - -o ./cached_gnat/UCD-13.0.0.zip https://www.unicode.org/Public/13.0.0/ucd/UCD.zip
35-
mkdir data
36-
mkdir data/ucd
37-
unzip cached_gnat/UCD-13.0.0.zip -d ./data/ucd
29+
curl -C - -o UCD-13.0.0.zip https://www.unicode.org/Public/13.0.0/ucd/UCD.zip
30+
mkdir vss/data
31+
mkdir vss/data/ucd
32+
unzip UCD-13.0.0.zip -d vss/data/ucd
3833
- name: Build and test
34+
shell: bash
3935
run: |
40-
make all check coverage BUILD_MODE=${{ matrix.build_mode }}
41-
make install check_install PREFIX=/tmp BUILD_MODE=${{ matrix.build_mode }}
36+
export PATH=`ls -d $PWD/cached_gnat/*/bin |tr '\n' ':'`$PATH
37+
make -C vss all check coverage BUILD_MODE=${{ matrix.build_mode }}
38+
make -C vss install check_install PREFIX=/tmp BUILD_MODE=${{ matrix.build_mode }}
4239
- name: Upload coverage to Codecov
43-
uses: codecov/codecov-action@v1
40+
uses: codecov/codecov-action@v2
4441
if: ${{ matrix.build_mode == 'coverage' }}
42+
with:
43+
working-directory: vss

0 commit comments

Comments
 (0)