-
-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 164ed5e Author: Kirill Müller <[email protected]> Date: Thu Jan 2 16:41:29 2025 +0100 Remove tag check commit 8448043 Author: Kirill Müller <[email protected]> Date: Thu Jan 2 16:40:10 2025 +0100 vendor_base_dir commit 4010491 Author: Kirill Müller <[email protected]> Date: Thu Jan 2 16:11:29 2025 +0100 Change project dir commit a69b6b2 Author: Kirill Müller <[email protected]> Date: Thu Jan 2 15:33:32 2025 +0100 Add vendor-one.sh script commit a84a185 Author: Kirill Müller <[email protected]> Date: Thu Jan 2 15:20:59 2025 +0100 Sync commit 327e04a Author: Kirill Müller <[email protected]> Date: Thu Jan 2 15:16:29 2025 +0100 Rename commit ebd9422 Author: Kirill Müller <[email protected]> Date: Sun Dec 1 21:48:08 2024 +0100 chore: Sync vendor script with duckdb
- Loading branch information
Showing
5 changed files
with
189 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
#!/bin/bash | ||
# https://unix.stackexchange.com/a/654932/19205 | ||
# Using bash for -o pipefail | ||
|
||
set -e | ||
set -x | ||
set -o pipefail | ||
|
||
cd `dirname $0` | ||
|
||
project=igraph | ||
vendor_base_dir=src/vendor | ||
vendor_dir=${vendor_base_dir}/cigraph | ||
repo_org=${project} | ||
repo_name=${project} | ||
|
||
|
||
if [ -z "$1" ]; then | ||
upstream_basedir=../../${project} | ||
else | ||
upstream_basedir="$1" | ||
fi | ||
|
||
upstream_dir=.git/${project} | ||
|
||
if [ "$upstream_basedir" != "$upstream_dir" ]; then | ||
git clone "$upstream_basedir" "$upstream_dir" | ||
fi | ||
|
||
if [ -n "$(git status --porcelain)" ]; then | ||
echo "Error: working directory not clean" | ||
exit 1 | ||
fi | ||
|
||
if [ -n "$(git -C "$upstream_dir" status --porcelain)" ]; then | ||
echo "Warning: working directory $upstream_dir not clean" | ||
fi | ||
|
||
base=$(git log -n 3 --format="%s" -- ${vendor_dir} | tee /dev/stderr | sed -nr '/^.*'${repo_org}.${repo_name}'@([0-9a-f]+)( .*)?$/{s//\1/;p;}' | head -n 1) | ||
|
||
original=$(git -C "$upstream_dir" log --first-parent --reverse --format="%H" ${base}..HEAD) | ||
|
||
message= | ||
is_tag= | ||
|
||
for commit in $original; do | ||
echo "Importing commit $commit" | ||
|
||
git -C "$upstream_dir" checkout "$commit" | ||
|
||
rm -rf ${vendor_dir} | ||
mkdir -p ${vendor_dir} | ||
|
||
git clone "$upstream_dir" ${vendor_dir} | ||
|
||
cmake -S${vendor_dir} -B${vendor_dir}/build | ||
|
||
mv ${vendor_dir}/build/include/igraph_version.h src/vendor/ | ||
|
||
rm -rf ${vendor_dir}/.git ${vendor_dir}/.github ${vendor_dir}/doc ${vendor_dir}/examples ${vendor_dir}/fuzzing ${vendor_dir}/tests ${vendor_dir}/tools ${vendor_dir}/build | ||
|
||
make -f Makefile-cigraph | ||
|
||
R -q -e 'cpp11::cpp_register()' | ||
|
||
# Always vendor tags | ||
if [ $(git -C "$upstream_dir" describe --tags "$commit" | grep -c -- -) -eq 0 ]; then | ||
message="vendor: Update vendored sources (tag $(git -C "$upstream_dir" describe --tags "$commit")) to ${repo_org}/${repo_name}@$commit" | ||
is_tag=true | ||
break | ||
fi | ||
|
||
if [ $(git status --porcelain -- ${vendor_base_dir} | wc -l) -gt 1 ]; then | ||
message="vendor: Update vendored sources to ${repo_org}/${repo_name}@$commit" | ||
break | ||
fi | ||
done | ||
|
||
if [ "$message" = "" ]; then | ||
echo "No changes." | ||
git checkout -- ${vendor_base_dir} | ||
rm -rf "$upstream_dir" | ||
exit 0 | ||
fi | ||
|
||
git add . | ||
|
||
( | ||
echo "$message" | ||
echo | ||
git -C "$upstream_dir" log --first-parent --format="%s" ${base}..${commit} | tee /dev/stderr | sed -r 's%(#[0-9]+)%'${repo_org}/${repo_name}'\1%g' | ||
) | git commit --file /dev/stdin | ||
|
||
rm -rf "$upstream_dir" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
#!/bin/bash | ||
# https://unix.stackexchange.com/a/654932/19205 | ||
# Using bash for -o pipefail | ||
|
||
set -e | ||
set -x | ||
set -o pipefail | ||
|
||
cd `dirname $0` | ||
|
||
project=igraph | ||
vendor_base_dir=src/vendor | ||
vendor_dir=${vendor_base_dir}/cigraph | ||
repo_org=${project} | ||
repo_name=${project} | ||
|
||
|
||
if [ -z "$1" ]; then | ||
upstream_basedir=../../${project} | ||
else | ||
upstream_basedir="$1" | ||
fi | ||
|
||
upstream_dir=.git/${project} | ||
|
||
if [ "$upstream_basedir" != "$upstream_dir" ]; then | ||
git clone "$upstream_basedir" "$upstream_dir" | ||
fi | ||
|
||
if [ -n "$(git status --porcelain)" ]; then | ||
echo "Error: working directory not clean" | ||
exit 1 | ||
fi | ||
|
||
if [ -n "$(git -C "$upstream_dir" status --porcelain)" ]; then | ||
echo "Warning: working directory $upstream_dir not clean" | ||
fi | ||
|
||
base=$(git log -n 3 --format="%s" -- ${vendor_dir} | tee /dev/stderr | sed -nr '/^.*'${repo_org}.${repo_name}'@([0-9a-f]+)( .*)?$/{s//\1/;p;}' | head -n 1) | ||
|
||
original=$(git -C "$upstream_dir" rev-parse --verify HEAD) | ||
|
||
message= | ||
is_tag= | ||
|
||
for commit in $original; do | ||
echo "Importing commit $commit" | ||
|
||
rm -rf ${vendor_dir} | ||
mkdir -p ${vendor_dir} | ||
|
||
git clone "$upstream_dir" ${vendor_dir} | ||
|
||
cmake -S${vendor_dir} -B${vendor_dir}/build | ||
|
||
mv ${vendor_dir}/build/include/igraph_version.h src/vendor/ | ||
|
||
rm -rf ${vendor_dir}/.git ${vendor_dir}/.github ${vendor_dir}/doc ${vendor_dir}/examples ${vendor_dir}/fuzzing ${vendor_dir}/tests ${vendor_dir}/tools ${vendor_dir}/build | ||
|
||
make -f Makefile-cigraph | ||
|
||
R -q -e 'cpp11::cpp_register()' | ||
|
||
# Always vendor tags | ||
if [ $(git -C "$upstream_dir" describe --tags "$commit" | grep -c -- -) -eq 0 ]; then | ||
message="vendor: Update vendored sources (tag $(git -C "$upstream_dir" describe --tags "$commit")) to ${repo_org}/${repo_name}@$commit" | ||
is_tag=true | ||
break | ||
fi | ||
|
||
if [ $(git status --porcelain -- ${vendor_base_dir} | wc -l) -gt 1 ]; then | ||
message="vendor: Update vendored sources to ${repo_org}/${repo_name}@$commit" | ||
break | ||
fi | ||
done | ||
|
||
if [ "$message" = "" ]; then | ||
echo "No changes." | ||
git checkout -- ${vendor_base_dir} | ||
rm -rf "$upstream_dir" | ||
exit 0 | ||
fi | ||
|
||
git add . | ||
|
||
( | ||
echo "$message" | ||
echo | ||
git -C "$upstream_dir" log --first-parent --format="%s" ${base}..${commit} | tee /dev/stderr | sed -r 's%(#[0-9]+)%'${repo_org}/${repo_name}'\1%g' | ||
) | git commit --file /dev/stdin | ||
|
||
rm -rf "$upstream_dir" |