Skip to content

Commit

Permalink
remove what's left of git lfs
Browse files Browse the repository at this point in the history
  • Loading branch information
erciccione authored and woodser committed Sep 17, 2022
1 parent 220a1f9 commit a31cb74
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 26 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
*.jpg binary
*.jpeg binary
*.png binary
p2p/src/main/resources/*XMR_LOCAL filter=lfs diff=lfs merge=lfs -text
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
java-version: '11'
distribution: 'adopt'
cache: gradle
- name: Pull lfs
run: git lfs pull
- name: Build with make
run: make
- name: cache nodes dependencies
Expand Down Expand Up @@ -57,7 +55,5 @@ jobs:
with:
java-version: '11'
distribution: 'adopt'
- name: Pull lfs
run: git lfs pull
- name: Build with Gradle
run: ./gradlew build --stacktrace --scan
11 changes: 0 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -307,17 +307,6 @@ configure(project(':p2p')) {
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
testCompile("org.mockito:mockito-core:$mockitoVersion")
}

processResources.doFirst {
// Sanity check that Git LFS-managed data store files have actually been sync'd.
// If they have not, e.g. because Git LFS is not installed, they will be text files
// containing a sha256 hash of the remote object, indicating we should stop the
// build and inform the user how to fix the problem.
if (file('src/main/resources/AccountAgeWitnessStore_XMR_LOCAL_placeholder').text.contains("oid sha256:"))
throw new GradleException("p2p data store files have not been synchronized. " +
"To fix this, ensure you have Git LFS installed and run `git lfs pull`. " +
"See docs/build.md for more information.")
}
}


Expand Down
2 changes: 1 addition & 1 deletion docs/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ These are the steps needed to build Haveno and test it on our test network or lo

## Install dependencies

On Ubuntu: `sudo apt install make wget git git-lfs openjdk-11-jdk`. The Monero binaries will be downloaded and verified automatically in the next step.
On Ubuntu: `sudo apt install make wget git openjdk-11-jdk`. The Monero binaries will be downloaded and verified automatically in the next step.

## Build Haveno

Expand Down

This file was deleted.

8 changes: 0 additions & 8 deletions pricenode/install_pricenode_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ echo "[*] Upgrading apt packages"
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get update -q
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y

echo "[*] Installing Git LFS"
sudo -H -i -u "${ROOT_USER}" curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
sudo -H -i -u "${ROOT_USER}" apt-get -y install git-lfs
sudo -H -i -u "${ROOT_USER}" git lfs install

echo "[*] Installing Tor"
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y "${TOR_PKG}"

Expand Down Expand Up @@ -66,9 +61,6 @@ sudo -H -i -u "${ROOT_USER}" apt-get install -qq -y openjdk-11-jdk
echo "[*] Checking out Haveno ${HAVENO_LATEST_RELEASE}"
sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && git checkout ${HAVENO_LATEST_RELEASE}"

echo "[*] Performing Git LFS pull"
sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && git lfs pull"

echo "[*] Building Haveno from source"
sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && ./gradlew :pricenode:installDist -x test < /dev/null" # redirect from /dev/null is necessary to workaround gradlew non-interactive shell hanging issue

Expand Down

0 comments on commit a31cb74

Please sign in to comment.