From 09d2b1a6c6c08e0291966d169480c7f896ad24be Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Thu, 10 Jun 2021 11:14:55 +0200 Subject: [PATCH] use master branch for arm64 graphcopy and properly merge the abc interpreter patches --- clean-abc-interpreter/linux-arm64/build.sh | 7 ++++++- clean-lib-graphcopy/linux-arm64/build.sh | 3 --- clean-lib-graphcopy/linux-arm64/git-sources.txt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/clean-abc-interpreter/linux-arm64/build.sh b/clean-abc-interpreter/linux-arm64/build.sh index e7aa1ba..3ee1f6e 100755 --- a/clean-abc-interpreter/linux-arm64/build.sh +++ b/clean-abc-interpreter/linux-arm64/build.sh @@ -2,7 +2,12 @@ set -e #to remove when changes are in the master -( cd src/abc-interpreter-master; git pull origin 103-linux-arm64-interface; ) +( + cd src/abc-interpreter-master; + git config --global user.email "ci@gitlab.science.ru.nl" + git config --global user.name "ci" + git pull origin 103-linux-arm64-interface; +) cp -r src/abc-interpreter-master build/abc-interpreter diff --git a/clean-lib-graphcopy/linux-arm64/build.sh b/clean-lib-graphcopy/linux-arm64/build.sh index f4f8a7f..6a536f1 100755 --- a/clean-lib-graphcopy/linux-arm64/build.sh +++ b/clean-lib-graphcopy/linux-arm64/build.sh @@ -1,9 +1,6 @@ #!/bin/sh mkdir -p target/clean-lib-graphcopy -#remove when changes are in master -cp -r src/clean-libraries-linux-arm64-graphcopy-support src/clean-libraries-master - # Add clean libraries mkdir -p target/clean-lib-graphcopy/lib/GraphCopy cp -r src/clean-libraries-master/Libraries/graph_copy/*.[di]cl target/clean-lib-graphcopy/lib/GraphCopy/ diff --git a/clean-lib-graphcopy/linux-arm64/git-sources.txt b/clean-lib-graphcopy/linux-arm64/git-sources.txt index 0a5811c..874a10a 100644 --- a/clean-lib-graphcopy/linux-arm64/git-sources.txt +++ b/clean-lib-graphcopy/linux-arm64/git-sources.txt @@ -1 +1 @@ -https://gitlab.science.ru.nl/clean-and-itasks/clean-libraries linux-arm64-graphcopy-support +https://gitlab.science.ru.nl/clean-and-itasks/clean-libraries master -- GitLab