From 962dc442b2418fb8564d0e8a1c2f3a8d48dff5e7 Mon Sep 17 00:00:00 2001
From: Johannes Kanig <kanig@adacore.com>
Date: Tue, 26 Nov 2024 17:22:47 +0900
Subject: [PATCH] Remove private url for public packages

---
 .gitlab-ci.yml          | 20 +++++++-------------
 .pre-commit-config.yaml |  7 ++++---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65dfbd39..aea55755 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,17 +2,16 @@ include:
   - component: $CI_SERVER_FQDN/eng/gitlab-templates/check-issue@~latest
     inputs:
       stage: check
+  - component: $CI_SERVER_FQDN/eng/gitlab-templates/pre-commit@~latest
+    inputs:
+      stage: check
+
 stages:
   - check
 
-check:
-  services:
-     - image:pe-base
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  stage: check
-  needs: [] # Execute regardless of the other stages
-  script:
+
+pre-commit:
+  before_script:
     - generic_anod_ci $GENERIC_ANOD_CI_OPTIONS
     - cat /tmp/ci_env.sh
     - . /tmp/ci_env.sh
@@ -21,8 +20,3 @@ check:
     - eval $(anod printenv gnat)
     - cd $CI_PROJECT_DIR
     - . setup.sh
-    - make check
-    - python -mvenv /tmp/venv
-    - . /tmp/venv/bin/activate
-    - python -mpip install pre-commit
-    - pre-commit run -a --show-diff-on-failure
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f1924a65..06fc948f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,10 +12,11 @@ repos:
       files: '\.opt$'
       language: system
       entry: e3-opt-check
-  - repo: git@ssh.gitlab.adacore-it.com:eng/shared/mirrors/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
     -   id: check-json
+        exclude: ^\.vscode/
     -   id: check-merge-conflict
     -   id: check-symlinks
     -   id: check-yaml
@@ -27,13 +28,13 @@ repos:
     hooks:
     -   id: check-empty-testoutopt
     -   id: check-testsuite-markers
-  - repo: git@ssh.gitlab.adacore-it.com:it/flake8.git
+  - repo: https://github.com/pycqa/flake8
     rev: 7.0.0
     hooks:
     - id: flake8
       additional_dependencies:
         - flake8-bugbear
-  - repo: git@ssh.gitlab.adacore-it.com:it/black.git
+  - repo: https://github.com/ambv/black
     rev: 24.2.0
     hooks:
     - id: black