Merge branch 'release/v1.20.0' into jen/v1200

scripts/build-arch-bundle.sh

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-ARCH=$1
-
-REQUIRED=(
-    "ipfs"
-    "sha512sum"
-)
-for REQUIRE in "${REQUIRED[@]}"
-do
-    command -v "${REQUIRE}" >/dev/null 2>&1 || echo >&2 "'${REQUIRE}' must be installed"
-done
-
-mkdir bundle
-pushd bundle
-
-BINARIES=(
-    "lotus"
-    "lotus-miner"
-    "lotus-worker"
-)
-
-export IPFS_PATH=`mktemp -d`
-ipfs init
-ipfs daemon &
-PID="$!"
-trap "kill -9 ${PID}" EXIT
-sleep 30
-
-mkdir -p "${ARCH}/lotus"
-pushd "${ARCH}"
-for BINARY in "${BINARIES[@]}"
-do
-    cp "../../${ARCH}/${BINARY}" "lotus/"
-    chmod +x "lotus/${BINARY}"
-done
-
-tar -zcvf "../lotus_${CIRCLE_TAG}_${ARCH}-amd64.tar.gz" lotus
-popd
-rm -rf "${ARCH}"
-
-sha512sum "lotus_${CIRCLE_TAG}_${ARCH}-amd64.tar.gz" > "lotus_${CIRCLE_TAG}_${ARCH}-amd64.tar.gz.sha512"
-
-ipfs add -q "lotus_${CIRCLE_TAG}_${ARCH}-amd64.tar.gz" > "lotus_${CIRCLE_TAG}_${ARCH}-amd64.tar.gz.cid"
-popd

scripts/docker-git-state-check.sh

@@ -0,0 +1,12 @@
+set -e
+
+if [ -z "$(git status --porcelain)" ]; then
+  echo "PASSED: Working directory clean"
+else
+  echo "FAILED: Working directory not clean."
+  echo "This is likely because the .dockerignore file has removed something checked into git."
+  echo "Add the missing files listed below to the .dockerignore to fix this issue:"
+  echo "$(git status)"
+  exit 1
+fi
+

scripts/generate-lotus-cli.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Generate lotus command lines documents as text and markdown in folder "lotus/documentation/en".
-# Python 2.7
+# Python 3
 
 import os
 

scripts/publish-arch-release.sh

@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-ARCH=$1
-
-pushd bundle
-
-# make sure we have a token set, api requests won't work otherwise
-if [ -z "${GITHUB_TOKEN}" ]; then
-  echo "\${GITHUB_TOKEN} not set, publish failed"
-  exit 1
-fi
-
-REQUIRED=(
-    "jq"
-    "curl"
-)
-for REQUIRE in "${REQUIRED[@]}"
-do
-    command -v "${REQUIRE}" >/dev/null 2>&1 || echo >&2 "'${REQUIRE}' must be installed"
-done
-
-#see if the release already exists by tag
-RELEASE_RESPONSE=`
-  curl \
-    --header "Authorization: token ${GITHUB_TOKEN}" \
-    "https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/releases/tags/${CIRCLE_TAG}"
-`
-RELEASE_ID=`echo "${RELEASE_RESPONSE}" | jq '.id'`
-
-if [ "${RELEASE_ID}" = "null" ]; then
-  echo "creating release"
-
-  COND_CREATE_DISCUSSION=""
-  PRERELEASE=true
-  if [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    COND_CREATE_DISCUSSION="\"discussion_category_name\": \"announcement\","
-    PRERELEASE=false
-  fi
-
-  RELEASE_DATA="{
-    \"tag_name\": \"${CIRCLE_TAG}\",
-    \"target_commitish\": \"${CIRCLE_SHA1}\",
-    ${COND_CREATE_DISCUSSION}
-    \"name\": \"${CIRCLE_TAG}\",
-    \"body\": \"\",
-    \"prerelease\": ${PRERELEASE}
-  }"
-
-  # create it if it doesn't exist yet
-  RELEASE_RESPONSE=`
-    curl \
-        --request POST \
-        --header "Authorization: token ${GITHUB_TOKEN}" \
-        --header "Content-Type: application/json" \
-        --data "${RELEASE_DATA}" \
-        "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/${CIRCLE_PROJECT_REPONAME}/releases"
-  `
-else
-  echo "release already exists"
-fi
-
-RELEASE_UPLOAD_URL=`echo "${RELEASE_RESPONSE}" | jq -r '.upload_url' | cut -d'{' -f1`
-echo "Preparing to send artifacts to ${RELEASE_UPLOAD_URL}"
-
-if [ $ARCH = 'linux' ]; then
-artifacts=(
-  "lotus_${CIRCLE_TAG}_linux-amd64.tar.gz"
-  "lotus_${CIRCLE_TAG}_linux-amd64.tar.gz.cid"
-  "lotus_${CIRCLE_TAG}_linux-amd64.tar.gz.sha512"
-)
-elif [ $ARCH = 'darwin' ]; then
-artifacts=(
-  "lotus_${CIRCLE_TAG}_darwin-amd64.tar.gz"
-  "lotus_${CIRCLE_TAG}_darwin-amd64.tar.gz.cid"
-  "lotus_${CIRCLE_TAG}_darwin-amd64.tar.gz.sha512"
-)
-elif [ $ARCH = 'appimage' ]; then
-artifacts=(
-  "Lotus-${CIRCLE_TAG}-x86_64.AppImage"
-  "Lotus-${CIRCLE_TAG}-x86_64.AppImage.cid"
-  "Lotus-${CIRCLE_TAG}-x86_64.AppImage.sha512"
-)
-else
-  echo "$1 is not a supported architecture to publish a release for" 1>&2
-  exit 1
-fi
-
-for RELEASE_FILE in "${artifacts[@]}"
-do
-  echo "Uploading ${RELEASE_FILE}..."
-  curl \
-    --request POST \
-    --fail \
-    --header "Authorization: token ${GITHUB_TOKEN}" \
-    --header "Content-Type: application/octet-stream" \
-    --data-binary "@${RELEASE_FILE}" \
-    "$RELEASE_UPLOAD_URL?name=$(basename "${RELEASE_FILE}")"
-
-  echo "Uploaded ${RELEASE_FILE}"
-done
-
-popd
-
-miscellaneous=(
-  "README.md"
-  "LICENSE-MIT"
-  "LICENSE-APACHE"
-)
-for MISC in "${miscellaneous[@]}"
-do
-  echo "Uploading release bundle: ${MISC}"
-  curl \
-    --request POST \
-    --header "Authorization: token ${GITHUB_TOKEN}" \
-    --header "Content-Type: application/octet-stream" \
-    --data-binary "@${MISC}" \
-    "$RELEASE_UPLOAD_URL?name=$(basename "${MISC}")"
-
-  echo "Release bundle uploaded: ${MISC}"
-done