diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-16 14:50:16 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-17 13:55:18 +0200 |
| commit | fa263877691a7babb08a83f5f977390a0ba64729 (patch) | |
| tree | 3a1fe50be542c2d3291fe12cabaab3d1ca350da4 | |
| parent | d78ff380a2cde80c264e36e046b1cfc054bd9253 (diff) | |
| download | bitcoin-fa263877691a7babb08a83f5f977390a0ba64729.tar.xz | |
ci: Refactor: Remove CI_USE_APT_INSTALL
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rwxr-xr-x | ci/test/01_base_install.sh | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d72a2b289d..980f6e9de9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ env: # Global defaults PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y" 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 - 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_DIR: "/tmp/ccache_dir" CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44ee0b5c59..b333b77454 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,15 @@ on: env: 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: macos-native-x86_64: name: macOS 13 native, x86_64 [no depends, sqlite only, gui] # Use latest image, but hardcode version to avoid silent upgrades (and breaks). # 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. if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request' @@ -30,9 +31,6 @@ jobs: timeout-minutes: 120 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' BASE_ROOT_DIR: ${{ github.workspace }} diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index c9a496e6ab..de3f5acc95 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -22,7 +22,7 @@ fi if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then bash -c "dnf -y install epel-release" 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 echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list fi |