CI: rename ci folder to consistent naming (MR 2514)

part of https://gitlab.com/postmarketOS/postmarketos/-/issues/26
This commit is contained in:
bo41 2021-09-13 18:15:23 +02:00 committed by Bart Ribbers
parent b27a1305bf
commit ef0117cc4e
No known key found for this signature in database
GPG key ID: 0BF4C1B5988C50D8
19 changed files with 14 additions and 14 deletions

View file

@ -5,4 +5,4 @@ export PYTHONUNBUFFERED=1
JOB_ARCH="${CI_JOB_NAME#build-}" JOB_ARCH="${CI_JOB_NAME#build-}"
set -x set -x
su pmos -c ".gitlab-ci/build_changed_aports.py $JOB_ARCH" su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"

View file

@ -162,7 +162,7 @@ def get_changed_packages():
# Skip files: # Skip files:
# * in the root dir of pmaports (e.g. README.md) # * in the root dir of pmaports (e.g. README.md)
# * path with a dot (e.g. .gitlab-ci/, device/.shared-patches/) # * path with a dot (e.g. .ci/, device/.shared-patches/)
if not dirname or file.startswith(".") or "/." in file: if not dirname or file.startswith(".") or "/." in file:
continue continue

View file

@ -32,4 +32,4 @@ if ! [ -e $deviceinfo ]; then
fi fi
# Run testcases # Run testcases
pytest -vv -x --tb=native "$pmaports/.gitlab-ci/testcases" "$@" pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"

View file

@ -38,7 +38,7 @@ sh_files="
$(find . -path './main/devicepkg-dev/*.sh') $(find . -path './main/devicepkg-dev/*.sh')
$(find . -path './main/postmarketos-mvcfg/*.sh') $(find . -path './main/postmarketos-mvcfg/*.sh')
$(find . -path '.gitlab-ci/*.sh') $(find . -path '.ci/*.sh')
" "
for file in $sh_files; do for file in $sh_files; do
echo "Test with shellcheck: $file" echo "Test with shellcheck: $file"

View file

@ -46,7 +46,7 @@ def test_executable_files():
# Make sure files are either: # Make sure files are either:
# - in root directory (README.md) # - in root directory (README.md)
# - hidden (.gitlab-ci/, device/.shared-patches/) # - hidden (.ci/, device/.shared-patches/)
# - or belong to a package (below a directory with APKBUILD) # - or belong to a package (below a directory with APKBUILD)
def test_files_belong_to_package(): def test_files_belong_to_package():
# Walk directories and set package_dir when we find an APKBUILD # Walk directories and set package_dir when we find an APKBUILD

View file

@ -3,7 +3,7 @@
# global settings # global settings
image: alpine:latest image: alpine:latest
after_script: after_script:
- .gitlab-ci/move_logs.sh $CI_PROJECT_DIR - .ci/move_logs.sh $CI_PROJECT_DIR
stages: stages:
- lint - lint
- build - build
@ -34,7 +34,7 @@ wiki:
before_script: before_script:
- apk -q add python3 - apk -q add python3
script: script:
- .gitlab-ci/check_devices_in_wiki.py --booting - .ci/check_devices_in_wiki.py --booting
# testcases linting # testcases linting
testcases-linting: testcases-linting:
@ -44,8 +44,8 @@ testcases-linting:
refs: refs:
- merge_requests - merge_requests
changes: changes:
- .gitlab-ci/* - .ci/*
- .gitlab-ci/*/* - .ci/*/*
before_script: before_script:
- apk -q add py-flake8 - apk -q add py-flake8
script: script:
@ -59,7 +59,7 @@ shellcheck:
before_script: before_script:
- apk -q add shellcheck - apk -q add shellcheck
script: script:
- .gitlab-ci/shellcheck.sh - .ci/shellcheck.sh
# aports checks (generic) # aports checks (generic)
aports-static: aports-static:
@ -69,8 +69,8 @@ aports-static:
- wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
- sh ./install_pmbootstrap.sh pytest - sh ./install_pmbootstrap.sh pytest
script: script:
- su pmos -c ".gitlab-ci/run_testcases.sh" - su pmos -c ".ci/run_testcases.sh"
- su pmos -c ".gitlab-ci/check_changed_aports_versions.py" - su pmos -c ".ci/check_changed_aports_versions.py"
artifacts: artifacts:
when: on_failure when: on_failure
paths: paths:
@ -98,7 +98,7 @@ aport-lint:
- wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
- sh ./install_pmbootstrap.sh - sh ./install_pmbootstrap.sh
script: script:
- su pmos -c ".gitlab-ci/apkbuild-linting.py" - su pmos -c ".ci/apkbuild-linting.py"
only: only:
- merge_requests - merge_requests
allow_failure: true allow_failure: true
@ -139,7 +139,7 @@ mr-settings:
- wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
- sh ./install_pmbootstrap.sh - sh ./install_pmbootstrap.sh
script: script:
- .gitlab-ci/build.sh - .ci/build.sh
- cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week