foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-14 11:26:09 -05:00
Code Issues Activity

ci: Refactor: Remove CI_USE_APT_INSTALL

Browse source
This commit is contained in:
MarcoFalke 2023-08-16 14:50:16 +02:00
parent d78ff380a2
commit fa26387769
No known key found for this signature in database
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -3,7 +3,7 @@ env: # Global defaults
PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y" PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y"
MAKEJOBS: "-j10" MAKEJOBS: "-j10"
TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
CI_FAILFAST_TEST_LEAVE_DANGLING: "1" # Cirrus CI does not care about dangling process and setting this variable avoids killing the CI script itself on error CI_FAILFAST_TEST_LEAVE_DANGLING: "1" # Cirrus CI does not care about dangling processes and setting this variable avoids killing the CI script itself on error
CCACHE_MAXSIZE: "200M" CCACHE_MAXSIZE: "200M"
CCACHE_DIR: "/tmp/ccache_dir" CCACHE_DIR: "/tmp/ccache_dir"
CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine

8
.github/workflows/ci.yml vendored
View file

@ -15,14 +15,15 @@ on:
env: env:
DANGER_RUN_CI_ON_HOST: 1 DANGER_RUN_CI_ON_HOST: 1
TEST_RUNNER_TIMEOUT_FACTOR: 40 CI_FAILFAST_TEST_LEAVE_DANGLING: 1 # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error
MAKEJOBS: '-j10'
jobs: jobs:
macos-native-x86_64: macos-native-x86_64:
name: macOS 13 native, x86_64 [no depends, sqlite only, gui] name: macOS 13 native, x86_64 [no depends, sqlite only, gui]
# Use latest image, but hardcode version to avoid silent upgrades (and breaks). # Use latest image, but hardcode version to avoid silent upgrades (and breaks).
# See: https://github.com/actions/runner-images#available-images. # See: https://github.com/actions/runner-images#available-images.
runs-on: macos-13 runs-on: macos-13 # Use M1 once available https://github.com/github/roadmap/issues/528
# No need to run on the read-only mirror, unless it is a PR. # No need to run on the read-only mirror, unless it is a PR.
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request' if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'
@ -30,9 +31,6 @@ jobs:
timeout-minutes: 120 timeout-minutes: 120
env: env:
MAKEJOBS: '-j4'
CI_USE_APT_INSTALL: 'no'
PACKAGE_MANAGER_INSTALL: 'echo' # Nothing to do
FILE_ENV: './ci/test/00_setup_env_mac_native.sh' FILE_ENV: './ci/test/00_setup_env_mac_native.sh'
BASE_ROOT_DIR: ${{ github.workspace }} BASE_ROOT_DIR: ${{ github.workspace }}

2
ci/test/01_base_install.sh
View file

@ -22,7 +22,7 @@ fi
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
bash -c "dnf -y install epel-release" bash -c "dnf -y install epel-release"
bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES" bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then elif [ "$CI_OS_NAME" != "macos" ]; then
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
fi fi