Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use git-scripts in addition to plume-scripts #450

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Use git-scripts in addition to plume-scripts #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf5a5e
Use git-scripts
Ao-senXiong Jun 27, 2024
0561b2b
Use git-script in .ci-build.sh
Ao-senXiong Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .ci-build-without-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ else
export JAVA_HOME=${JAVA_HOME:-$(dirname $(dirname $(readlink -f $(which javac))))}
fi

if [ -d "/tmp/plume-scripts" ] ; then
git -C /tmp/plume-scripts pull -q
if [ -d "/tmp/git-scripts" ] ; then
git -C /tmp/git-scripts pull -q
else
git -C /tmp clone --depth 1 -q https://github.com/eisop-plume-lib/plume-scripts.git
git -C /tmp clone --depth 1 -q https://github.com/eisop-plume-lib/git-scripts.git
fi

export AFU="${AFU:-../annotation-tools/annotation-file-utilities}"
# Don't use `AT=${AFU}/..` which causes a git failure.
AT=$(dirname "${AFU}")

## Build annotation-tools (Annotation File Utilities)
/tmp/plume-scripts/git-clone-related opprop annotation-tools "${AT}"
/tmp/git-scripts/git-clone-related opprop annotation-tools "${AT}"
if [ ! -d ../annotation-tools ] ; then
ln -s "${AT}" ../annotation-tools
fi
Expand All @@ -39,7 +39,7 @@ export CHECKERFRAMEWORK="${CHECKERFRAMEWORK:-$(pwd -P)/../checker-framework}"
export PATH=$AFU/scripts:$JAVA_HOME/bin:$PATH

## Build Checker Framework
/tmp/plume-scripts/git-clone-related opprop checker-framework ${CHECKERFRAMEWORK}
/tmp/git-scripts/git-clone-related opprop checker-framework ${CHECKERFRAMEWORK}

# This also builds annotation-tools
(cd $CHECKERFRAMEWORK && ./gradlew assembleForJavac)
Expand Down
2 changes: 1 addition & 1 deletion .ci-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [[ "${GROUP}" == downstream* && "${SLUGOWNER}" == "opprop" ]]; then
clone_downstream () {
DOWNSTREAM_PROJ="$(pwd -P)/../$1"
echo "clone downstream to: ${DOWNSTREAM_PROJ}"
COMMAND="/tmp/plume-scripts/git-clone-related opprop $1 ${DOWNSTREAM_PROJ}"
COMMAND="/tmp/git-scripts/git-clone-related opprop $1 ${DOWNSTREAM_PROJ}"
echo "Running: ($COMMAND)"
(eval $COMMAND)
echo "... done: ($COMMAND)"
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildDLJC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ ROOT=$(cd ${myDir}/../../ && pwd)
if [ -d $ROOT/do-like-javac ] ; then
(cd $ROOT/do-like-javac && git pull)
else
(/tmp/plume-scripts/git-clone-related opprop do-like-javac $ROOT/do-like-javac)
(/tmp/git-scripts/git-clone-related opprop do-like-javac $ROOT/do-like-javac)
fi
Loading