|
10 | 10 | env:
|
11 | 11 | cache-path: |
|
12 | 12 | .git/modules
|
13 |
| - binutils |
14 |
| - gdb |
15 |
| - gcc |
16 |
| - llvm |
17 |
| - newlib |
18 |
| - glibc |
19 |
| - musl |
20 |
| - uclib-ng |
21 |
| - dejagnu |
22 |
| - pk |
23 |
| - qemu |
24 |
| - spike |
25 | 13 | jobs:
|
26 | 14 | cache:
|
27 | 15 | name: Update Submodule Cache
|
@@ -87,44 +75,39 @@ jobs:
|
87 | 75 | echo "-- After --"
|
88 | 76 | df -h
|
89 | 77 |
|
90 |
| - - name: Generate Submodules List |
| 78 | + - uses: actions/checkout@v4 |
| 79 | + |
| 80 | + - name: Load cache |
| 81 | + uses: actions/cache/restore@v4 |
| 82 | + with: |
| 83 | + path: ${{ env.cache-path }} |
| 84 | + key: ${{ env.cache-key }} |
| 85 | + |
| 86 | + - name: Restore submodules |
91 | 87 | id: cache-path
|
92 |
| - if: false |
93 | 88 | run: |
|
94 |
| - submodules="gdb:binutils" |
| 89 | + submodules="gdb binutils" |
95 | 90 | case "${{ matrix.mode }}" in
|
96 | 91 | "linux")
|
97 |
| - submodules="$submodules:glibc";; |
| 92 | + submodules="$submodules glibc";; |
98 | 93 | "musl")
|
99 |
| - submodules="$submodules:musl";; |
| 94 | + submodules="$submodules musl";; |
100 | 95 | "uclibc")
|
101 |
| - submodules="$submodules:uclibc-ng";; |
| 96 | + submodules="$submodules uclibc-ng";; |
102 | 97 | "newlib")
|
103 |
| - submodules="$submodules:newlib";; |
| 98 | + submodules="$submodules newlib";; |
104 | 99 | *)
|
105 | 100 | echo "Invalid Mode"; exit 1;;
|
106 | 101 | esac
|
107 | 102 | case "${{ matrix.compiler }}" in
|
108 | 103 | "gcc")
|
109 |
| - submodules="$submodules:gcc";; |
| 104 | + submodules="$submodules gcc";; |
110 | 105 | "llvm")
|
111 |
| - submodules="$submodules:llvm";; |
| 106 | + submodules="$submodules llvm";; |
112 | 107 | *)
|
113 | 108 | echo "Invalid Compiler"; exit 1;;
|
114 | 109 | esac
|
115 |
| - submodules=$(echo $submodules | sed 's/:/\n/g') |
116 |
| - submodules=$submodules$'\n'$(echo "$submodules" | sed -e 's/^/.git\/modules\//') |
117 |
| - echo 'submodules<<EOF' >> $GITHUB_OUTPUT |
118 |
| - echo "$submodules" >> $GITHUB_OUTPUT |
119 |
| - echo 'EOF' >> $GITHUB_OUTPUT |
120 |
| -
|
121 |
| - - uses: actions/checkout@v4 |
122 |
| - |
123 |
| - - name: Load Cache |
124 |
| - uses: actions/cache/restore@v4 |
125 |
| - with: |
126 |
| - path: ${{ env.cache-path }} |
127 |
| - key: ${{ env.cache-key }} |
| 110 | + git submodule update --init $submodules |
128 | 111 |
|
129 | 112 | - name: Install Dependencies
|
130 | 113 | run: sudo ./.github/setup-apt.sh
|
@@ -207,6 +190,9 @@ jobs:
|
207 | 190 | path: ${{ env.cache-path }}
|
208 | 191 | key: ${{ env.cache-key }}
|
209 | 192 |
|
| 193 | + - name: Restore submodules |
| 194 | + run: git submodule update --init gcc newlib binutils gdb spike pk dejagnu |
| 195 | + |
210 | 196 | - name: Install Dependencies
|
211 | 197 | run: sudo ./.github/setup-apt.sh
|
212 | 198 |
|
|
0 commit comments