diff --git a/python/README.rst b/python/README.rst index fc757a713..35cdb3847 100644 --- a/python/README.rst +++ b/python/README.rst @@ -142,7 +142,7 @@ This docker image can be used to run tests and build Python wheels for all inter $ docker run -e DCC_NEW_TMP_EMAIL \ --rm -it -v \$(pwd):/mnt -w /mnt \ - deltachat/coredeps ci_scripts/run_all.sh + deltachat/coredeps scripts/run_all.sh Optionally build your own docker image @@ -151,9 +151,9 @@ Optionally build your own docker image If you want to build your own custom docker image you can do this:: $ cd deltachat-core # cd to deltachat-core checkout directory - $ docker build -t deltachat/coredeps ci_scripts/docker_coredeps + $ docker build -t deltachat/coredeps scripts/docker_coredeps -This will use the ``ci_scripts/docker_coredeps/Dockerfile`` to build +This will use the ``scripts/docker_coredeps/Dockerfile`` to build up docker image called ``deltachat/coredeps``. You can afterwards find it with:: diff --git a/ci_scripts/README.md b/scripts/README.md similarity index 92% rename from ci_scripts/README.md rename to scripts/README.md index 012a85bcb..3787ea3fe 100644 --- a/ci_scripts/README.md +++ b/scripts/README.md @@ -30,8 +30,8 @@ There is experimental support for triggering a remote Python or Rust test run from your local checkout/branch. You will need to be authorized to login to the build machine (ask your friendly sysadmin on #deltachat freenode) to type:: - ci_scripts/manual_remote_tests.sh rust - ci_scripts/manual_remote_tests.sh python + scripts/manual_remote_tests.sh rust + scripts/manual_remote_tests.sh python This will **rsync** your current checkout to the remote build machine (no need to commit before) and then run either rust or python tests. @@ -45,6 +45,6 @@ python tests and build wheels (binary packages for Python) You can build the docker images yourself locally to avoid the relatively large download:: - cd ci_scripts # where all CI things are + cd scripts # where all CI things are docker build -t deltachat/coredeps docker-coredeps docker build -t deltachat/doxygen docker-doxygen diff --git a/ci_scripts/ci_upload.sh b/scripts/ci_upload.sh similarity index 97% rename from ci_scripts/ci_upload.sh rename to scripts/ci_upload.sh index 64484c748..f478bdeef 100755 --- a/ci_scripts/ci_upload.sh +++ b/scripts/ci_upload.sh @@ -42,7 +42,7 @@ echo ----------------------- # Bundle external shared libraries into the wheels ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SSHTARGET mkdir -p $BUILDDIR -scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ci_scripts/cleanup_devpi_indices.py $SSHTARGET:$BUILDDIR +scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null scripts/cleanup_devpi_indices.py $SSHTARGET:$BUILDDIR rsync -avz \ -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ $WHEELHOUSEDIR \ diff --git a/ci_scripts/cleanup_devpi_indices.py b/scripts/cleanup_devpi_indices.py similarity index 100% rename from ci_scripts/cleanup_devpi_indices.py rename to scripts/cleanup_devpi_indices.py diff --git a/ci_scripts/coverage.sh b/scripts/coverage.sh similarity index 100% rename from ci_scripts/coverage.sh rename to scripts/coverage.sh diff --git a/ci_scripts/docker-coredeps/Dockerfile b/scripts/docker-coredeps/Dockerfile similarity index 100% rename from ci_scripts/docker-coredeps/Dockerfile rename to scripts/docker-coredeps/Dockerfile diff --git a/ci_scripts/docker-coredeps/deps/build_openssl.sh b/scripts/docker-coredeps/deps/build_openssl.sh similarity index 100% rename from ci_scripts/docker-coredeps/deps/build_openssl.sh rename to scripts/docker-coredeps/deps/build_openssl.sh diff --git a/ci_scripts/docker-coredeps/deps/build_perl.sh b/scripts/docker-coredeps/deps/build_perl.sh similarity index 100% rename from ci_scripts/docker-coredeps/deps/build_perl.sh rename to scripts/docker-coredeps/deps/build_perl.sh diff --git a/ci_scripts/docker-coredeps/deps/build_python.sh b/scripts/docker-coredeps/deps/build_python.sh similarity index 100% rename from ci_scripts/docker-coredeps/deps/build_python.sh rename to scripts/docker-coredeps/deps/build_python.sh diff --git a/ci_scripts/docker-coredeps/deps/build_rust.sh b/scripts/docker-coredeps/deps/build_rust.sh similarity index 100% rename from ci_scripts/docker-coredeps/deps/build_rust.sh rename to scripts/docker-coredeps/deps/build_rust.sh diff --git a/ci_scripts/docker-doxygen/Dockerfile b/scripts/docker-doxygen/Dockerfile similarity index 100% rename from ci_scripts/docker-doxygen/Dockerfile rename to scripts/docker-doxygen/Dockerfile diff --git a/ci_scripts/manual_remote_tests.sh b/scripts/manual_remote_tests.sh similarity index 87% rename from ci_scripts/manual_remote_tests.sh rename to scripts/manual_remote_tests.sh index 295ca2958..f654d3e82 100755 --- a/ci_scripts/manual_remote_tests.sh +++ b/scripts/manual_remote_tests.sh @@ -6,4 +6,4 @@ export CIRCLE_BUILD_NUM=$USER export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2` export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`) -time bash ci_scripts/$CIRCLE_JOB.sh +time bash scripts/$CIRCLE_JOB.sh diff --git a/ci_scripts/old/gh-actions-rust.yml b/scripts/old/gh-actions-rust.yml similarity index 100% rename from ci_scripts/old/gh-actions-rust.yml rename to scripts/old/gh-actions-rust.yml diff --git a/ci_scripts/old/run-python.sh b/scripts/old/run-python.sh similarity index 100% rename from ci_scripts/old/run-python.sh rename to scripts/old/run-python.sh diff --git a/ci_scripts/remote_python_packaging.sh b/scripts/remote_python_packaging.sh similarity index 97% rename from ci_scripts/remote_python_packaging.sh rename to scripts/remote_python_packaging.sh index aeebc2ac1..d480496dc 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/scripts/remote_python_packaging.sh @@ -36,7 +36,7 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE # run everything else inside docker docker run -e DCC_NEW_TMP_EMAIL \ --rm -it -v \$(pwd):/mnt -w /mnt \ - deltachat/coredeps ci_scripts/run_all.sh + deltachat/coredeps scripts/run_all.sh _HERE diff --git a/ci_scripts/remote_tests_python.sh b/scripts/remote_tests_python.sh similarity index 96% rename from ci_scripts/remote_tests_python.sh rename to scripts/remote_tests_python.sh index ab29497b4..ff4b79bdd 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/scripts/remote_tests_python.sh @@ -42,5 +42,5 @@ ssh $SSHTARGET <<_HERE source \$HOME/venv/bin/activate which python - bash ci_scripts/run-python-test.sh + bash scripts/run-python-test.sh _HERE diff --git a/ci_scripts/remote_tests_rust.sh b/scripts/remote_tests_rust.sh similarity index 95% rename from ci_scripts/remote_tests_rust.sh rename to scripts/remote_tests_rust.sh index 5f08f1c08..03d551109 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/scripts/remote_tests_rust.sh @@ -25,6 +25,6 @@ ssh $SSHTARGET <<_HERE export TARGET=x86_64-unknown-linux-gnu export RUSTC_WRAPPER=sccache - bash ci_scripts/run-rust-test.sh + bash scripts/run-rust-test.sh _HERE diff --git a/ci_scripts/run-doxygen.sh b/scripts/run-doxygen.sh similarity index 100% rename from ci_scripts/run-doxygen.sh rename to scripts/run-doxygen.sh diff --git a/ci_scripts/run-python-test.sh b/scripts/run-python-test.sh similarity index 100% rename from ci_scripts/run-python-test.sh rename to scripts/run-python-test.sh diff --git a/ci_scripts/run-rust-test.sh b/scripts/run-rust-test.sh similarity index 100% rename from ci_scripts/run-rust-test.sh rename to scripts/run-rust-test.sh diff --git a/ci_scripts/run_all.sh b/scripts/run_all.sh similarity index 100% rename from ci_scripts/run_all.sh rename to scripts/run_all.sh