From ae2e4b518df2b8f65b5de1c09ef825dfb2dfebfc Mon Sep 17 00:00:00 2001 From: Julien Constant Date: Fri, 2 Sep 2022 19:49:28 +0200 Subject: [PATCH 1/2] Removed old GitLab files & may fix auto_assign for reviewers --- .github/auto_assign.yml | 4 +- .gitlab-ci.yml | 91 ----------------------------------------- .mailmap | 18 -------- 3 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .mailmap diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 212aeb27..d577edab 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -6,8 +6,8 @@ addAssignees: author # A list of team reviewers to be added to pull requests (GitHub team slug) reviewers: - - /sith-3-developers + - ae-utbm/sith-3-developers -# Number of reviewers has no impact on Github teams +# Number of reviewers has no impact on GitHub teams # Set 0 to add all the reviewers (default: 0) numberOfReviewers: 0 \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 936f47e9..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,91 +0,0 @@ -stages: - - test - - deploy - -# Installs and launch unittests -unittests: - stage: test - script: - # Install dependencies - - apt-get update - - apt-get install -y gettext libxapian-dev libgraphviz-dev - - pip install poetry - # Check pyproject.toml validity - - poetry check - # Install project - - poetry install -E testing -E docs - # Setup xapian index - - mkdir -p /dev/shm/search_indexes - - ln -s /dev/shm/search_indexes sith/search_indexes - # Setup project - - poetry run ./manage.py compilemessages - # Run tests and export report - - poetry run coverage run ./manage.py test - - poetry run coverage xml - - poetry run coverage report - # Build documentation - - cd doc - - poetry run make html - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip_tests" - cache: - paths: - - .cache/pip_tests - artifacts: - when: always - paths: - - coverage.xml - - coverage_report/ - - docs/_build - reports: - junit: coverage.xml - -# Check black -black: - stage: test - script: - - version=$(cat pyproject.toml | grep --color=never black | grep --color=never -oE '[0-9]([0-9.a-z]+)') - - pip install black==$version - - black --check . - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip_black" - cache: - paths: - - .cache/pip_black - -deploy: - stage: deploy - before_script: - ## - ## Install ssh-agent if not already installed, it is required by Docker. - ## (change apt-get to yum if you use an RPM-based image) - ## - - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - - ## - ## Run ssh-agent (inside the build environment) - ## - - eval $(ssh-agent -s) - - ## - ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - ## We're using tr to fix line endings which makes ed25519 keys work - ## without extra base64 encoding. - ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556 - ## - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - ## - ## Create the SSH directory and give it the right permissions - ## - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - script: - - ssh -o StrictHostKeyChecking=accept-new sith@ae-web $SITH_PROD_SCRIPT_PATH - environment: - name: prod - url: https://ae.utbm.fr - only: - refs: - - master - when: on_success diff --git a/.mailmap b/.mailmap deleted file mode 100644 index 9533f02a..00000000 --- a/.mailmap +++ /dev/null @@ -1,18 +0,0 @@ -Code -Cyl -Juste -Krophil -Lo-J -Nabos -Och -Partoo -Skia -Skia -Sli -Soldat -Terre -Vial -Zar -root -tleb -tleb From 7cc6250860a5816a26782846c1f4009d1b5426cf Mon Sep 17 00:00:00 2001 From: Julien Constant Date: Fri, 2 Sep 2022 19:53:41 +0200 Subject: [PATCH 2/2] Delete thank_you.md --- .gitlab/service_desk_templates/thank_you.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .gitlab/service_desk_templates/thank_you.md diff --git a/.gitlab/service_desk_templates/thank_you.md b/.gitlab/service_desk_templates/thank_you.md deleted file mode 100644 index b494cbab..00000000 --- a/.gitlab/service_desk_templates/thank_you.md +++ /dev/null @@ -1,11 +0,0 @@ -## Bonjour ! 👋🏼 - -Merci pour votre signalement, nous suivons votre requête avec le ticket %{ISSUE_ID}, et reviendrons très prochainement vers vous ! - -En cas d'information supplémentaires, vous pouvez d'or et déjà répondre à ce mail en y incluant les informations complémentaires dont vous souhaitez nous faire part. Cela nous sera très utile pour mener nos investigations concernant votre problème ! - -En attendant, n'oubliez pas de cultiver vos rêves... - -Bien à vous - -L'équipe informatique de l'AE - ❤️