Skip to content

Commit 3f3817e

Browse files
Fix phased updates for github runner
1 parent 6bc9536 commit 3f3817e

File tree

5 files changed

+1
-9
lines changed

5 files changed

+1
-9
lines changed

.github/actions/build-native-binary/action.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ runs:
3939

4040
- name: Install tools
4141
run: |
42+
sudo echo RESET grub-efi/install_devices | sudo debconf-communicate grub-pc
4243
sudo apt-get install apt-transport-https --yes
4344
sudo apt-get -y update
4445
sudo apt-get -y upgrade

Dockerfile.amd64

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
6060
COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0 /sua/lib/
6161
COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
6262
COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63-
COPY --from=build /work/build_amd64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/
6463
COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
6564
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
6665
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates

Dockerfile.arm64

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
6060
COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0 /sua/lib/
6161
COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
6262
COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63-
COPY --from=build /work/build_arm64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/
6463
COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
6564
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
6665
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates

cmake/dependencies.cmake

-6
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ set_property(
5555
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so
5656
)
5757

58-
add_library(pcre_lib SHARED IMPORTED)
59-
set_property(
60-
TARGET pcre_lib
61-
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/pcre2-10.40/libpcre2-8.so
62-
)
63-
6458
add_library(z_lib SHARED IMPORTED)
6559
set_property(
6660
TARGET z_lib

src/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ target_link_libraries(${PROJECT_NAME}
5656
gmodule_lib
5757
glib_lib
5858
ffi_lib
59-
pcre_lib
6059
z_lib
6160
${SUA_PLATFORM_LIBS}
6261
ssl_lib

0 commit comments

Comments
 (0)