Skip to content

Commit d620298

Browse files
committed
use git for compression
1 parent f067aa2 commit d620298

File tree

1 file changed

+20
-34
lines changed

1 file changed

+20
-34
lines changed

.github/workflows/build.yaml

+20-34
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@ on:
1010
env:
1111
cache-path: |
1212
.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
2513
jobs:
2614
cache:
2715
name: Update Submodule Cache
@@ -87,44 +75,39 @@ jobs:
8775
echo "-- After --"
8876
df -h
8977
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
9187
id: cache-path
92-
if: false
9388
run: |
94-
submodules="gdb:binutils"
89+
submodules="gdb binutils"
9590
case "${{ matrix.mode }}" in
9691
"linux")
97-
submodules="$submodules:glibc";;
92+
submodules="$submodules glibc";;
9893
"musl")
99-
submodules="$submodules:musl";;
94+
submodules="$submodules musl";;
10095
"uclibc")
101-
submodules="$submodules:uclibc-ng";;
96+
submodules="$submodules uclibc-ng";;
10297
"newlib")
103-
submodules="$submodules:newlib";;
98+
submodules="$submodules newlib";;
10499
*)
105100
echo "Invalid Mode"; exit 1;;
106101
esac
107102
case "${{ matrix.compiler }}" in
108103
"gcc")
109-
submodules="$submodules:gcc";;
104+
submodules="$submodules gcc";;
110105
"llvm")
111-
submodules="$submodules:llvm";;
106+
submodules="$submodules llvm";;
112107
*)
113108
echo "Invalid Compiler"; exit 1;;
114109
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
128111
129112
- name: Install Dependencies
130113
run: sudo ./.github/setup-apt.sh
@@ -207,6 +190,9 @@ jobs:
207190
path: ${{ env.cache-path }}
208191
key: ${{ env.cache-key }}
209192

193+
- name: Restore submodules
194+
run: git submodule update --init gcc newlib binutils gdb spike pk dejagnu
195+
210196
- name: Install Dependencies
211197
run: sudo ./.github/setup-apt.sh
212198

0 commit comments

Comments
 (0)