Skip to content

Commit 809675e

Browse files
1Conan1Conan
authored
Fix CI (#49)
* ci: update actions * remove scheduled runs * bump zlib * fix libplist * bump libimobiledevice-glue * fix libirecovery * remove irecovery patches * use all cores * readline patch * tools patch * wip * wip * wip * libtatsu * libtatsu * wip * wip * wip * wip * wip
1 parent 4b691e9 commit 809675e

File tree

2 files changed

+62
-63
lines changed

2 files changed

+62
-63
lines changed

‎.github/workflows/build_release.yml‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,18 @@ on:
33
push:
44
pull_request:
55
workflow_dispatch:
6-
schedule:
7-
- cron: '0 0 1 1 *'
8-
- cron: '0 0 1 4 *'
9-
- cron: '0 0 30 6 *'
10-
- cron: '0 0 28 9 *'
11-
- cron: '0 0 27 12 *'
126

137
env:
148
SSL_LIBRARY: openssl
15-
LIBPLIST_VERSION: 2.3.0
16-
LIBIMOBILEDEVICE__GLUE_VERSION: 1.0.0
9+
LIBPLIST_VERSION: 2.6.0
10+
LIBIMOBILEDEVICE__GLUE_VERSION: 1.3.1
1711
LIBIRECOVERY_VERSION: 1.1.0
18-
ZLIB_VERSION: 1.3
12+
ZLIB_VERSION: 1.3.1
1913
LIBZIP_VERSION: 1.9.2
2014
WOLFSSL_VERSION: 5.6.3
21-
OPENSSL_VERSION: 3.1.3
15+
OPENSSL_VERSION: 3.1.7
2216
LIBCURL_VERSION: 7.79.1
17+
LIBTATSU_VERSION: 1.0.4
2318

2419
jobs:
2520

@@ -35,7 +30,7 @@ jobs:
3530
- mipsel-linux-musl
3631
- riscv32-linux-musl
3732
- riscv64-linux-musl
38-
- x86_64-w64-mingw32
33+
# - x86_64-w64-mingw32
3934

4035
env:
4136
TRIPLE: ${{ matrix.triple }}
@@ -87,7 +82,7 @@ jobs:
8782
echo "CFLAGS=-Os -pipe -static -ffunction-sections -fdata-sections -flto" >> $GITHUB_ENV
8883
echo "CXXFLAGS=-Os -pipe -static -ffunction-sections -fdata-sections -flto" >> $GITHUB_ENV
8984
echo "CPPFLAGS=-I${BUILD_BASE}/include" >> $GITHUB_ENV
90-
echo "LDFLAGS=-Wl,--gc-sections -Wl,-strip-all -L${BUILD_BASE}/lib -L${BUILD_BASE}/lib64" >> $GITHUB_ENV
85+
echo "LDFLAGS=-L${BUILD_BASE}/lib -L${BUILD_BASE}/lib64" >> $GITHUB_ENV
9186
echo "PKG_CONFIG_PATH=${BUILD_BASE}/lib/pkgconfig" >> $GITHUB_ENV
9287
echo "LD_LIBRARY_PATH=${BUILD_BASE}/lib" >> $GITHUB_ENV
9388
@@ -104,7 +99,7 @@ jobs:
10499
./configure \
105100
--prefix=${BUILD_BASE} \
106101
--static
107-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
102+
make -j$(nproc) -l$(nproc)
108103
make install
109104
110105
- name: build libzip
@@ -147,29 +142,22 @@ jobs:
147142
-DBUILD_EXAMPLES=OFF \
148143
-DBUILD_DOC=OFF
149144
150-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
145+
make -j$(nproc) -l$(nproc)
151146
make install
152147
153-
154148
- name: build libplist
155149
run: |
156150
wget -q -nc -P ${BUILD_SOURCE} \
157-
https://github.com/libimobiledevice/libplist/archive/refs/heads/master.tar.gz
158-
mv ${BUILD_SOURCE}/master.tar.gz ${BUILD_SOURCE}/libplist-master.tar.gz
159-
tar xf ${BUILD_SOURCE}/libplist-master.tar.gz -C ${BUILD_WORK}
160-
161-
echo "${LIBPLIST_VERSION}" > ${BUILD_WORK}/libplist-master/.tarball-version
162-
163-
cd ${BUILD_WORK}/libplist-master
151+
https://github.com/libimobiledevice/libplist/archive/${LIBPLIST_VERSION}.tar.gz
152+
tar xf ${BUILD_SOURCE}/${LIBPLIST_VERSION}.tar.gz -C ${BUILD_WORK}
153+
echo "2.6.0" > ${BUILD_WORK}/libplist-${LIBPLIST_VERSION}/.tarball-version
154+
cd ${BUILD_WORK}/libplist-${LIBPLIST_VERSION}
164155
PACKAGE_VERSION=${LIBPLIST_VERSION} ./autogen.sh \
165156
${CONFIGURE_FLAGS} \
166157
--without-cython \
167158
--without-tests
168-
sed -i '78d' include/plist/plist.h
169-
sed -i '79,91d' include/plist/plist.h
170159
sed -i 's/tools//g' Makefile
171-
172-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
160+
make -j$(nproc)
173161
make install
174162
175163
- name: build libimobiledevice-glue
@@ -185,7 +173,7 @@ jobs:
185173
PACKAGE_VERSION=${LIBIMOBILEDEVICE__GLUE_VERSION} ./autogen.sh \
186174
${CONFIGURE_FLAGS}
187175
188-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
176+
make -j$(nproc) -l$(nproc)
189177
make install
190178
191179
- name: build libirecovery
@@ -195,24 +183,21 @@ jobs:
195183
mv ${BUILD_SOURCE}/master.tar.gz ${BUILD_SOURCE}/libirecovery-master.tar.gz
196184
tar xf ${BUILD_SOURCE}/libirecovery-master.tar.gz -C ${BUILD_WORK}
197185
198-
# Remove readline requirement
199-
sed -i '/readline/,+2d' ${BUILD_WORK}/libirecovery-master/configure.ac
200-
# Disable tools building
201-
sed -i '/tools/d' ${BUILD_WORK}/libirecovery-master/configure.ac
202-
sed -i 's/ tools//' ${BUILD_WORK}/libirecovery-master/Makefile.am
203-
204186
echo "${LIBIRECOVERY_VERSION}" > ${BUILD_WORK}/libirecovery-master/.tarball-version
205187
206188
cd ${BUILD_WORK}/libirecovery-master
189+
sed -i '80,95d' configure.ac
190+
sed -i '202d' configure.ac
191+
sed -i '/tools/d' configure.ac
192+
sed -i 's/ tools//' Makefile.am
193+
207194
PACKAGE_VERSION=${LIBIRECOVERY_VERSION} ./autogen.sh \
208195
${CONFIGURE_FLAGS} \
209196
--with-dummy \
210-
--without-udev
211-
212-
sed -i '30d' include/libirecovery.h
213-
sed -i '31,43d' include/libirecovery.h
197+
--without-udev \
198+
--without-tools
214199
215-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
200+
make -j$(nproc) -l$(nproc)
216201
make install
217202
218203
- name: build wolfssl
@@ -228,7 +213,7 @@ jobs:
228213
cd ${BUILD_WORK}/wolfssl-${WOLFSSL_VERSION}-stable
229214
./autogen.sh
230215
./configure \
231-
${CONFIGURE_FLAGS} \
216+
${CONFIGURE_FLAGS} \
232217
--disable-examples \
233218
--disable-crypttests \
234219
--disable-tls13 \
@@ -242,7 +227,7 @@ jobs:
242227
--enable-altcertchains \
243228
--enable-opensslextra
244229
245-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
230+
make -j$(nproc) -l$(nproc)
246231
make install
247232
248233
- name: build openssl
@@ -272,7 +257,7 @@ jobs:
272257
273258
cd ${BUILD_WORK}/openssl-${OPENSSL_VERSION}
274259
CC= CXX= AR= RANLIB= ./Configure no-shared no-tests --cross-compile-prefix=${TRIPLE}- --prefix=${BUILD_BASE} --static -static ${PLATFORM}
275-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2) CC="${CC}" CXX="${CXX}" AR="${AR}" RANLIB="${RANLIB}"
260+
make -j$(nproc) -l$(nproc) CC="${CC}" CXX="${CXX}" AR="${AR}" RANLIB="${RANLIB}"
276261
make install_sw DESTDIR="${ROOT}"
277262
278263
- name: build tiny-curl
@@ -307,7 +292,19 @@ jobs:
307292
--enable-libcurl-option \
308293
${CURL_FLAGS}
309294
310-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
295+
make -j$(nproc) -l$(nproc)
296+
make install
297+
298+
- name: build libtatsu
299+
run: |
300+
wget -q -nc -P ${BUILD_SOURCE} \
301+
https://github.com/libimobiledevice/libtatsu/archive/${LIBTATSU_VERSION}.tar.gz
302+
tar xf ${BUILD_SOURCE}/${LIBTATSU_VERSION}.tar.gz -C ${BUILD_WORK}
303+
echo "${LIBTATSU_VERSION}" > ${BUILD_WORK}/libtatsu-${LIBTATSU_VERSION}/.tarball-version
304+
cd ${BUILD_WORK}/libtatsu-${LIBTATSU_VERSION}
305+
PACKAGE_VERSION=${LIBTATSU_VERSION} ./autogen.sh \
306+
${CONFIGURE_FLAGS}
307+
make -j$(nproc)
311308
make install
312309
313310
- name: (not) build libgeneral
@@ -341,7 +338,7 @@ jobs:
341338
./autogen.sh \
342339
${CONFIGURE_FLAGS}
343340
344-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2)
341+
make -j$(nproc) -l$(nproc)
345342
make install
346343
347344
- name: build tsschecker
@@ -363,11 +360,11 @@ jobs:
363360
--without-libcrypto \
364361
${TSSCHECKER_FLAGS}
365362
366-
make -j$(expr $(nproc) / 2) -l$(expr $(nproc) / 2) \
367-
LDFLAGS="-all-static -static ${LDFLAGS}"
363+
make -j$(nproc) -l$(nproc) \
364+
LDFLAGS="-Wl,--gc-sections -Wl,-strip-all -all-static -static ${LDFLAGS}"
368365
${TRIPLE}-strip tsschecker/tsschecker${EXE_SUFFIX}
369366
370-
- uses: actions/upload-artifact@v1
367+
- uses: actions/upload-artifact@v4
371368
if: ${{ !env.ACT }}
372369
with:
373370
name: tsschecker_${{ env.OS }}_${{ env.ARCH }}
@@ -390,7 +387,7 @@ jobs:
390387
echo "EOF" >> $GITHUB_ENV
391388
392389
- name: Download artifacts
393-
uses: actions/download-artifact@v2
390+
uses: actions/download-artifact@v4
394391
with:
395392
path: artifacts
396393

‎tsschecker/main.c‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -342,24 +342,26 @@ int main(int argc, const char * argv[]) {
342342
}
343343

344344
if (rawFilePath) {
345-
char *buf = NULL;
346-
size_t bufSize = 0;
347-
FILE *f = fopen(rawFilePath, "rb");
348-
if (!f)
349-
reterror(-100, "[TSSC] failed to read rawfile at \"%s\"\n",rawFilePath);
350-
fseek(f, 0, SEEK_END);
351-
bufSize = ftell(f);
352-
fseek(f, 0, SEEK_SET);
353-
buf = (char*)malloc(bufSize+1);
354-
fread(buf, 1, bufSize, f);
355-
fclose(f);
345+
printf("unsupported");
346+
return 1;
347+
// char *buf = NULL;
348+
// size_t bufSize = 0;
349+
// FILE *f = fopen(rawFilePath, "rb");
350+
// if (!f)
351+
// reterror(-100, "[TSSC] failed to read rawfile at \"%s\"\n",rawFilePath);
352+
// fseek(f, 0, SEEK_END);
353+
// bufSize = ftell(f);
354+
// fseek(f, 0, SEEK_SET);
355+
// buf = (char*)malloc(bufSize+1);
356+
// fread(buf, 1, bufSize, f);
357+
// fclose(f);
356358

357-
printf("Sending TSS request:\n%s",buf);
358-
char *rsp = tss_request_send_raw(buf, serverUrl, (int*)&bufSize);
359+
// printf("Sending TSS request:\n%s",buf);
360+
// char *rsp = tss_request_send_raw(buf, serverUrl, (int*)&bufSize);
359361

360-
printf("TSS server returned:\n%s\n",rsp);
361-
free(rsp);
362-
return 0;
362+
// printf("TSS server returned:\n%s\n",rsp);
363+
// free(rsp);
364+
// return 0;
363365
}
364366

365367
if (devVals.deviceBoard)

0 commit comments

Comments
 (0)