mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-05-06 19:16:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: move ci.sh and cirrusci.sh script to ci/ folder

Browse source 
Signed-off-by: Luís Ferreira <contact@lsferreira.net>
This commit is contained in:
Luís Ferreira 2022-02-14 19:33:58 +00:00
parent cb49e99f80
commit a7dc8f487b
No known key found for this signature in database
GPG key ID: 730750D54B7A9F66
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.cirrus.yml
View file

@ -1,6 +1,6 @@
common_steps_template: &COMMON_STEPS_TEMPLATE common_steps_template: &COMMON_STEPS_TEMPLATE
install_prerequisites_script: ./cirrusci.sh install_prerequisites_script: ./ci/cirrusci.sh
install_host_compiler_script: ./ci.sh install_host_compiler install_host_compiler_script: ./ci/run.sh install_host_compiler
setup_repos_script: | setup_repos_script: |
set -uexo pipefail set -uexo pipefail
ln -s $CIRRUS_WORKING_DIR ../dmd ln -s $CIRRUS_WORKING_DIR ../dmd
@ -22,25 +22,25 @@ common_steps_template: &COMMON_STEPS_TEMPLATE
fi fi
fi fi
./ci.sh setup_repos "$REPO_BRANCH" ./ci/run.sh setup_repos "$REPO_BRANCH"
build_script: ./ci.sh build build_script: ./ci/run.sh build
test_dmd_script: | test_dmd_script: |
if [ "${DMD_TEST_COVERAGE:-0}" == "1" ] if [ "${DMD_TEST_COVERAGE:-0}" == "1" ]
then then
OS_NAME=$OS ENABLE_RELEASE=0 ENABLE_DEBUG=1 ENABLE_COVERAGE=1 ./ci.sh rebuild OS_NAME=$OS ENABLE_RELEASE=0 ENABLE_DEBUG=1 ENABLE_COVERAGE=1 ./ci/run.sh rebuild
./ci.sh test_dmd ./ci/run.sh test_dmd
./ci.sh codecov ./ci/run.sh codecov
else else
./ci.sh test_dmd ./ci/run.sh test_dmd
fi fi
test_druntime_script: \[ "${DMD_TEST_COVERAGE:-0}" == "1" \] || ./ci.sh test_druntime test_druntime_script: \[ "${DMD_TEST_COVERAGE:-0}" == "1" \] || ./ci/run.sh test_druntime
test_phobos_script: \[ "${DMD_TEST_COVERAGE:-0}" == "1" \] || ./ci.sh test_phobos test_phobos_script: \[ "${DMD_TEST_COVERAGE:-0}" == "1" \] || ./ci/run.sh test_phobos
environment: environment:
CIRRUS_CLONE_DEPTH: 50 CIRRUS_CLONE_DEPTH: 50
# for ci.sh: # for ci/run.sh:
MODEL: 64 MODEL: 64
HOST_DMD: dmd HOST_DMD: dmd
N: 4 N: 4

4
cirrusci.sh → ci/cirrusci.sh
View file

@ -2,7 +2,7 @@
# Installs the OS-specific prerequisites for Cirrus CI jobs. # Installs the OS-specific prerequisites for Cirrus CI jobs.
# This file is invoked by DMD, druntime and Phobos' .cirrus.yml # This file is invoked by DMD, druntime and Phobos' .cirrus.yml
# and sets up the machine for the later steps with ci.sh. # and sets up the machine for the later steps with ci/run.sh.
set -uexo pipefail set -uexo pipefail
@ -22,7 +22,7 @@ if [ "$OS_NAME" == "linux" ]; then
packages="$packages g++-multilib libcurl4:i386" packages="$packages g++-multilib libcurl4:i386"
fi fi
if [ "${HOST_DMD:0:4}" == "gdmd" ]; then if [ "${HOST_DMD:0:4}" == "gdmd" ]; then
# ci.sh uses `sudo add-apt-repository ...` to add a PPA repo # ci/run.sh uses `sudo add-apt-repository ...` to add a PPA repo
packages="$packages sudo software-properties-common" packages="$packages sudo software-properties-common"
fi fi
apt-get -q update apt-get -q update

4
ci.sh → ci/run.sh
View file

@ -221,9 +221,9 @@ codecov()
if [ "$#" -gt 0 ]; then if [ "$#" -gt 0 ]; then
case $1 in case $1 in
install_host_compiler) install_host_compiler ;; install_host_compiler) install_host_compiler ;;
setup_repos) setup_repos "$2" ;; # ci.sh setup_repos <git branch> setup_repos) setup_repos "$2" ;; # ci/run.sh setup_repos <git branch>
build) build ;; build) build ;;
rebuild) rebuild "${2:-}" ;; # ci.sh rebuild [1] (use `1` to compare binaries to test reproducible build) rebuild) rebuild "${2:-}" ;; # ci/run.sh rebuild [1] (use `1` to compare binaries to test reproducible build)
test) test ;; test) test ;;
test_dmd) test_dmd ;; test_dmd) test_dmd ;;
test_druntime) test_druntime ;; test_druntime) test_druntime ;;

2
test/Makefile
View file

@ -137,7 +137,7 @@ export HOST_DMD:=$(subst \,/,$(HOST_DMD))
RUNNER:=$(RESULTS_DIR)/run$(EXE) RUNNER:=$(RESULTS_DIR)/run$(EXE)
EXECUTE_RUNNER:=$(RUNNER) --environment EXECUTE_RUNNER:=$(RUNNER) --environment
# N determines the amount of parallel jobs, see ci.sh # N determines the amount of parallel jobs, see ci/run.sh
ifneq ($(N),) ifneq ($(N),)
EXECUTE_RUNNER:=$(EXECUTE_RUNNER) --jobs=$N EXECUTE_RUNNER:=$(EXECUTE_RUNNER) --jobs=$N
endif endif