remove what's left of git lfs

This commit is contained in:
erciccione 2022-09-15 10:23:04 +02:00 committed by woodser
parent 220a1f9644
commit a31cb74230
6 changed files with 1 additions and 26 deletions

1
.gitattributes vendored
View file

@ -12,4 +12,3 @@
*.jpg binary *.jpg binary
*.jpeg binary *.jpeg binary
*.png binary *.png binary
p2p/src/main/resources/*XMR_LOCAL filter=lfs diff=lfs merge=lfs -text

View file

@ -24,8 +24,6 @@ jobs:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
cache: gradle cache: gradle
- name: Pull lfs
run: git lfs pull
- name: Build with make - name: Build with make
run: make run: make
- name: cache nodes dependencies - name: cache nodes dependencies
@ -57,7 +55,5 @@ jobs:
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
- name: Pull lfs
run: git lfs pull
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build --stacktrace --scan run: ./gradlew build --stacktrace --scan

View file

@ -307,17 +307,6 @@ configure(project(':p2p')) {
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion" testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
testCompile("org.mockito:mockito-core:$mockitoVersion") 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.")
}
} }

View file

@ -4,7 +4,7 @@ These are the steps needed to build Haveno and test it on our test network or lo
## Install dependencies ## 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 ## Build Haveno

View file

@ -1 +0,0 @@
TODO (woodser): this is a placeholder for git lfs files; replace with stored Haveno network data

View file

@ -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 update -q
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y 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" echo "[*] Installing Tor"
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y "${TOR_PKG}" sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y "${TOR_PKG}"
@ -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}" 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}" 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" 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 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