File tree Expand file tree Collapse file tree 2 files changed +15
-16
lines changed Expand file tree Collapse file tree 2 files changed +15
-16
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ $PWD/subprojects/stubs
18
18
export CPATH=/usr/local/include:/mingw64/include
19
19
export LIBRARY_PATH=/usr/local/lib:/mingw64/lib
20
20
export DYLD_LIBRARY_PATH=/usr/local/lib
21
+ export PATH=` ls -d $PWD /cached_gnat/* /bin | tr ' \n' ' :' ` $PATH
22
+ echo PATH=$PATH
21
23
22
24
BRANCH=master
23
25
@@ -36,9 +38,6 @@ FILE=libadalang-$RUNNER_OS-$BRANCH${DEBUG:+-dbg}-static.tar.gz
36
38
aws s3 cp s3://adacore-gha-tray-eu-west-1/libadalang/$FILE . --sse=AES256
37
39
tar xzf $FILE -C $prefix
38
40
rm -f -v $FILE
39
- gprinstall --uninstall gnatcoll || true
40
- gprinstall --uninstall gpr || true
41
- rm -f -v gnat/spawn* .gpr
42
41
43
42
which python
44
43
pip install --user e3-testsuite
Original file line number Diff line number Diff line change @@ -63,27 +63,27 @@ jobs:
63
63
- uses : actions/cache@v2
64
64
with :
65
65
path : ./cached_gnat
66
- key : ${{ runner.os }}-gnat-ce-2021
67
- restore-keys : ${{ runner.os }}-gnat-ce-2021
68
- - name : Get GNAT Community 2021 toolchain
69
- if : ${{ runner.os != 'macOS' }}
70
- uses : ada-actions/toolchain@ce2021
71
- with :
72
- distrib : community
73
- install_dir : ./cached_gnat
74
- - name : Get GNAT Community 2020 toolchain
75
- if : ${{ runner.os == 'macOS' }}
76
- uses : ada-actions/toolchain@ce2020
66
+ key : ${{ runner.os }}-alire-2021
67
+ restore-keys : ${{ runner.os }}-alire-2021
68
+ - name : Rename gnat/
69
+ if : ${{ runner.os == 'Windows' }}
70
+ shell : bash
71
+ run : mv gnat gnat_
72
+ # alr fails to run `gnat` on Windows if there is a dir
73
+ - name : Get GNAT toolchain with alire
74
+ uses : alire-project/setup-alire@v1
77
75
with :
78
- distrib : community
79
- install_dir : ./cached_gnat
76
+ toolchain : gnat_native^11 gprbuild^21
77
+ toolchain_dir : ./cached_gnat
80
78
- name : Build (Windows)
81
79
if : ${{ runner.os == 'Windows' }}
82
80
shell : msys2 {0}
83
81
env :
84
82
AWS_ACCESS_KEY_ID : ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
85
83
AWS_SECRET_ACCESS_KEY : ${{secrets.GHA_CACHE_SECRET}}
86
84
run : |
85
+ # Move `gnat` back
86
+ mv gnat_ gnat
87
87
# drop python if any
88
88
rm -rf -v ./cached_gnat/gnat*/bin/python*
89
89
# This is to avoid locking .sh on win that prevents its updating
You can’t perform that action at this time.
0 commit comments