Skip to content

Commit 1164e96

Browse files
cmainasurunc-bot[bot]
authored andcommitted
fix(solo5_version): Update Solo5 to latest version
Update Solo5 to the latest version which includes the fixes for aarch64 building. PR: #289 Signed-off-by: Charalampos Mainas <charalampos.mainas@gmail.com> Reviewed-by: Georgios Ntoutsos <gntouts@nubificus.co.uk> Approved-by: Georgios Ntoutsos <gntouts@nubificus.co.uk>
1 parent 68cb388 commit 1164e96

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
nerdctl_version: '2.1.3'
7777
crictl_version: 'v1.30.0'
7878
firecracker_version: 'v1.7.0'
79-
solo5_version: 'v0.9.0'
79+
solo5_version: 'v0.9.3'
8080
secrets: inherit
8181

8282
kind_test:
@@ -87,6 +87,6 @@ jobs:
8787
with:
8888
ref: ${{ inputs.ref }}
8989
firecracker_version: 'v1.7.0'
90-
solo5_version: 'v0.9.0'
90+
solo5_version: 'v0.9.3'
9191
runc_version: '1.3.0'
9292
secrets: inherit

‎.github/workflows/vm_test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ jobs:
165165
166166
- name: Install solo5
167167
run: |
168-
## TODO: Revert when PR gets merged or Solo5 fixes aarch64 building
169-
git clone -b fix_hvt_build_aarch64 https://github.com/nubificus/solo5.git
168+
git clone -b ${{ inputs.solo5_version }} https://github.com/Solo5/solo5.git
170169
cd solo5
171170
./configure.sh && make -j$(nproc)
172171
sudo cp tenders/hvt/solo5-hvt /usr/local/bin

‎deployment/urunc-deploy/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN rm -f /var/lib/dpkg/info/libc-bin.* && \
2626
WORKDIR /app
2727

2828
# Clone Solo5 repository and force static linking
29-
RUN git -c http.sslVerify=false clone --branch v0.9.0 https://github.com/Solo5/solo5.git . && \
29+
RUN git -c http.sslVerify=false clone --branch v0.9.3 https://github.com/Solo5/solo5.git . && \
3030
sed -i '66 a\HOSTLDFLAGS += -static-pie' tenders/GNUmakefile
3131

3232
# Build Solo5 and verify artifacts

0 commit comments

Comments
 (0)