diff --git a/contrib/source-control-tools/automated-commits.sh b/contrib/source-control-tools/automated-commits.sh index 2d685f5d2..dd69becd1 100755 --- a/contrib/source-control-tools/automated-commits.sh +++ b/contrib/source-control-tools/automated-commits.sh @@ -1,241 +1,241 @@ #!/usr/bin/env bash # Note: Any bot running this script must have the appropriate permissions to # push commits upstream. When running locally, this script will git push in a # dry run by default. export LC_ALL=C.UTF-8 set -euxo pipefail DEFAULT_PARENT_COMMIT="origin/master" help_message() { - set +x - echo "Generate a commit from available recipes." - echo - echo "Options:" - echo "-p, --parent The parent commit to build ontop of. Default: '${DEFAULT_PARENT_COMMIT}'" - echo " Note: This should only be used for testing since the behavior of setting" - echo " this to a particular commit varies slightly from the default." - echo "-h, --help Display this help message." - echo - echo "Environment Variables:" - echo "COMMIT_TYPE (required) The commit recipe to run." - echo "DRY_RUN If set to 'no', this script will push the generated changes upstream. Default: 'yes'" - set -x + cat < update-aur-version() { # shellcheck source=../utils/compare-version.sh source "${TOPLEVEL}"/contrib/utils/compare-version.sh PACKAGE="$1" CURRENT_VERSION="" get_current_version CURRENT_VERSION # Get the current version of the AUR package PKGBUILD="${TOPLEVEL}"/contrib/aur/${PACKAGE}/PKGBUILD # shellcheck source=../aur/bitcoin-abc/PKGBUILD source "${PKGBUILD}" # Compare the versions. We only want to update if # (software version > package version) to prevent downgrades. if version_less_equal "${CURRENT_VERSION}" "${pkgver}" then echo "Current version ${CURRENT_VERSION} <= ${PACKAGE} AUR package version ${pkgver}, skip the update" exit 0 fi # Reset the release version to 0 and update the package version in the # PKGBUILD file. # Note that this pattern is very safe: because of the shell script syntax, # no whitespace can occur and we have the original value as a variable. sed -i "s/pkgrel=${pkgrel}/pkgrel=0/" "${PKGBUILD}" sed -i "s/pkgver=${pkgver}/pkgver=${CURRENT_VERSION}/" "${PKGBUILD}" git add "${PKGBUILD}" git commit -m "Bump ${PACKAGE} AUR package version to ${CURRENT_VERSION}" } case "${COMMIT_TYPE}" in archive-release-notes) # shellcheck source=../utils/compare-version.sh source "${TOPLEVEL}"/contrib/utils/compare-version.sh RELEASE_NOTES_FILE="${TOPLEVEL}/doc/release-notes.md" RELEASE_NOTES_VERSION=$(sed -n "1s/^Bitcoin ABC version \([0-9]\+\.[0-9]\+\.[0-9]\+\).\+$/\1/p" "${RELEASE_NOTES_FILE}") RELEASE_NOTES_ARCHIVE="${TOPLEVEL}/doc/release-notes/release-notes-${RELEASE_NOTES_VERSION}.md" CURRENT_VERSION="" get_current_version CURRENT_VERSION # Compare the versions. We only want to archive the release notes if the # current version is greater the our release notes version. if version_less_equal "${CURRENT_VERSION}" "${RELEASE_NOTES_VERSION}" then echo "Current version ${CURRENT_VERSION} <= release-notes version ${RELEASE_NOTES_VERSION}, skip the update" exit 0 fi # Archive the release notes cp "${RELEASE_NOTES_FILE}" "${RELEASE_NOTES_ARCHIVE}" # Generate a fresh blank release notes file for the new version PROJECT_VERSION="${CURRENT_VERSION}" envsubst < "${TOPLEVEL}/doc/release-notes/release-notes.md.in" > "${RELEASE_NOTES_FILE}" git add "${RELEASE_NOTES_FILE}" "${RELEASE_NOTES_ARCHIVE}" git commit -m "${BOT_PREFIX} Archive release notes for version ${RELEASE_NOTES_VERSION}" ;; update-aur-version-bitcoin-abc) update-aur-version "bitcoin-abc" ;; update-aur-version-bitcoin-abc-qt) update-aur-version "bitcoin-abc-qt" ;; update-chainparams) CHAINPARAMS_SCRIPTS_DIR="${DEVTOOLS_DIR}"/chainparams # Assumes bitcoind instances are already running on mainnet and testnet pushd "${CHAINPARAMS_SCRIPTS_DIR}" CHAINPARAMS_MAINNET_TXT="chainparams_main.txt" ./make_chainparams.py > "${CHAINPARAMS_MAINNET_TXT}" git add "${CHAINPARAMS_MAINNET_TXT}" CHAINPARAMS_TESTNET_TXT="chainparams_test.txt" ./make_chainparams.py -a 127.0.0.1:18332 > "${CHAINPARAMS_TESTNET_TXT}" git add "${CHAINPARAMS_TESTNET_TXT}" CHAINPARAMS_CONSTANTS="${TOPLEVEL}"/src/chainparamsconstants.h ./generate_chainparams_constants.py . > "${CHAINPARAMS_CONSTANTS}" git add "${CHAINPARAMS_CONSTANTS}" popd git commit -m "${BOT_PREFIX} Update chainparams" ;; update-seeds) # Assumes seeder instances are already running on mainnet and testnet pushd "${TOPLEVEL}"/contrib/seeds : "${SEEDS_MAIN:=seeds_main.txt}" ./makeseeds.py < "${SEEDS_MAIN}" > nodes_main.txt git add nodes_main.txt : "${SEEDS_TEST:=seeds_test.txt}" ./makeseeds.py < "${SEEDS_TEST}" > nodes_test.txt git add nodes_test.txt SEEDS_HEADER="${TOPLEVEL}"/src/chainparamsseeds.h ./generate-seeds.py . > "${SEEDS_HEADER}" git add "${SEEDS_HEADER}" popd # Check that seeds have good connectivity "${DEVTOOLS_DIR}"/build_cmake.sh SEEDS_DIR="${TOPLEVEL}"/contrib/seeds RPC_PORT=18832 "${SEEDS_DIR}"/check-seeds.sh main 80 RPC_PORT=18833 "${SEEDS_DIR}"/check-seeds.sh test 70 git commit -m "${BOT_PREFIX} Update seeds" ;; update-timings) "${DEVTOOLS_DIR}"/build_cmake.sh pushd "${BUILD_DIR}" ninja check-functional-extended TIMING_SRC_FILE="${TOPLEVEL}"/test/functional/timing.json mv timing.json "${TIMING_SRC_FILE}" popd # Check that all tests are included in timing.json pushd "${TOPLEVEL}"/test/functional NON_TESTS=$(python3 -c 'from test_runner import NON_SCRIPTS; print(" ".join(NON_SCRIPTS))') export NON_TESTS check_missing() { # Exclude non-tests from the check if [[ "${NON_TESTS}" =~ $1 ]]; then exit 0 fi if ! grep -q $1 timing.json ; then echo "Error: Test file '$1' is missing from timing.json" exit 1 fi } export -f check_missing find . -maxdepth 1 -name '*.py' | cut -c 3- | xargs -I'{}' -n1 bash -c 'check_missing {}' popd git add "${TIMING_SRC_FILE}" git commit -m "${BOT_PREFIX} Update timing.json" ;; *) echo "Error: Invalid commit name '${COMMIT_TYPE}'" exit 10 ;; esac # Land the generated commit "${TOPLEVEL}"/contrib/source-control-tools/land-patch.sh "${LAND_PATCH_ARGS[@]}" diff --git a/contrib/source-control-tools/autopatch.sh b/contrib/source-control-tools/autopatch.sh index 05effaf97..e5e96b0b1 100755 --- a/contrib/source-control-tools/autopatch.sh +++ b/contrib/source-control-tools/autopatch.sh @@ -1,104 +1,104 @@ #!/usr/bin/env bash # Copyright (c) 2019-2020 The Bitcoin developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 set -euxo pipefail # --force is necessary to skip the "sanity check" step, which conflicts with # stacked revisions that contain already-landed dependencies. DEFAULT_PATCH_ARGS="--skip-dependencies --force --nobranch" DEFAULT_REMOTE="origin" DEFAULT_BRANCH="master" help_message() { - set +x - echo "Apply a patch from Phabricator cleanly on latest master." - echo "" - echo "Options:" - echo "-b, --branch The git branch to fetch and rebase onto. Default: '${DEFAULT_BRANCH}'" - echo "-h, --help Display this help message." - echo "-o, --remote The git remote to fetch latest from. Default: '${DEFAULT_REMOTE}'" - echo "-p, --patch-args Args to pass to 'arc patch'. Default: '${DEFAULT_PATCH_ARGS}'" - echo "-r, --revision The Differential revision ID used in Phabricator that you want to land. (ex: D1234)" - echo " This argument is required if --patch-args does not specify a revision or diff ID." - set -x + cat <