summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yml36
-rw-r--r--Makefile.am1
-rw-r--r--src/ideviceinstaller.c8
3 files changed, 23 insertions, 22 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 65384cf..70ed09c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,28 +17,28 @@ jobs:
run: |
echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV
- name: fetch libplist
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libplist-latest_${{env.target_triplet}}
repo: libimobiledevice/libplist
- name: fetch libusbmuxd
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libusbmuxd-latest_${{env.target_triplet}}
repo: libimobiledevice/libusbmuxd
- name: fetch libimobiledevice-glue
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libimobiledevice-glue-latest_${{env.target_triplet}}
repo: libimobiledevice/libimobiledevice-glue
- name: fetch libimobiledevice
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
@@ -53,7 +53,7 @@ jobs:
rm -rf extract/lib
sudo cp -r extract/* /
sudo ldconfig
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
fetch-depth: 0
- name: autogen
@@ -68,7 +68,7 @@ jobs:
DESTDIR=`pwd`/dest make install
tar -C dest -cf ideviceinstaller.tar usr
- name: publish artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ideviceinstaller-latest_${{env.target_triplet}}
path: ideviceinstaller.tar
@@ -84,28 +84,28 @@ jobs:
fi
shell: bash
- name: fetch libplist
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libplist-latest_macOS
repo: libimobiledevice/libplist
- name: fetch libusbmuxd
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libusbmuxd-latest_macOS
repo: libimobiledevice/libusbmuxd
- name: fetch libimobiledevice-glue
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libimobiledevice-glue-latest_macOS
repo: libimobiledevice/libimobiledevice-glue
- name: fetch libimobiledevice
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
@@ -118,7 +118,7 @@ jobs:
tar -C extract -xvf $I
done
sudo cp -r extract/* /
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: install additional requirements
run: |
SDKDIR=`xcrun --sdk macosx --show-sdk-path 2>/dev/null`
@@ -169,7 +169,7 @@ jobs:
DESTDIR=`pwd`/dest make install
tar -C dest -cf ideviceinstaller.tar usr
- name: publish artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ideviceinstaller-latest_macOS
path: ideviceinstaller.tar
@@ -206,28 +206,28 @@ jobs:
echo "dest=$dest" >> $GITHUB_ENV
echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV
- name: fetch libplist
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libplist-latest_${{ matrix.arch }}-${{ env.dest }}
repo: libimobiledevice/libplist
- name: fetch libusbmuxd
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libusbmuxd-latest_${{ matrix.arch }}-${{ env.dest }}
repo: libimobiledevice/libusbmuxd
- name: fetch libimobiledevice-glue
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
name: libimobiledevice-glue-latest_${{ matrix.arch }}-${{ env.dest }}
repo: libimobiledevice/libimobiledevice-glue
- name: fetch libimobiledevice
- uses: dawidd6/action-download-artifact@v2
+ uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
@@ -240,7 +240,7 @@ jobs:
tar -C extract -xvf $I
done
cp -r extract/* /
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: install additional requirements
run: |
FILENAME="libzip-1.7.1-static.tar.bz2"
@@ -262,7 +262,7 @@ jobs:
DESTDIR=`pwd`/dest make install
tar -C dest -cf ideviceinstaller.tar ${{ env.dest }}
- name: publish artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ideviceinstaller-latest_${{ matrix.arch }}-${{ env.dest }}
path: ideviceinstaller.tar
diff --git a/Makefile.am b/Makefile.am
index 5888709..ca007b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,4 +7,5 @@ EXTRA_DIST = \
git-version-gen
dist-hook:
+ @if ! git diff --quiet; then echo "Uncommitted changes present; not releasing"; exit 1; fi
echo $(VERSION) > $(distdir)/.tarball-version
diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c
index d6c10a8..c50bacf 100644
--- a/src/ideviceinstaller.c
+++ b/src/ideviceinstaller.c
@@ -1216,7 +1216,7 @@ run_again:
size_t flen = 0;
zbuf = buf_from_file(extmeta, &flen);
if (zbuf && flen) {
- meta = plist_new_data((uint8_t*)zbuf, flen);
+ meta = plist_new_data(zbuf, flen);
plist_from_memory(zbuf, flen, &meta_dict, NULL);
free(zbuf);
}
@@ -1231,7 +1231,7 @@ run_again:
if (!meta && !meta_dict) {
/* extract iTunesMetadata.plist from package */
if (zip_get_contents(zf, ITUNES_METADATA_PLIST_FILENAME, 0, &zbuf, &len) == 0) {
- meta = plist_new_data((uint8_t*)zbuf, len);
+ meta = plist_new_data(zbuf, len);
plist_from_memory(zbuf, len, &meta_dict, NULL);
}
if (!meta_dict) {
@@ -1304,7 +1304,7 @@ run_again:
size_t flen = 0;
zbuf = buf_from_file(extsinf, &flen);
if (zbuf && flen) {
- sinf = plist_new_data((uint8_t*)zbuf, flen);
+ sinf = plist_new_data(zbuf, flen);
free(zbuf);
} else {
fprintf(stderr, "WARNING: could not load external SINF %s!\n", extsinf);
@@ -1324,7 +1324,7 @@ run_again:
zbuf = NULL;
len = 0;
if (zip_get_contents(zf, sinfname, 0, &zbuf, &len) == 0) {
- sinf = plist_new_data((uint8_t*)zbuf, len);
+ sinf = plist_new_data(zbuf, len);
} else {
fprintf(stderr, "WARNING: could not locate %s in archive!\n", sinfname);
}
© 2009-2020 sukimashita.com - Generated by cgit - Icons from Tango - Uses Google Analytics