From 68bd0c8975f438dc7390c374fd15ecbf2cc85633 Mon Sep 17 00:00:00 2001
From: Raja Boujbel <raja.boujbel@ocamlpro.com>
Date: Wed, 29 Jan 2025 18:37:47 +0100
Subject: [PATCH] wip

---
 .github/scripts/main/main.sh |  2 +-
 .github/workflows/ci.ml      |  2 +-
 .github/workflows/main.yml   | 48 ++----------------------------------
 3 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/.github/scripts/main/main.sh b/.github/scripts/main/main.sh
index 424c908ef4a..eedfcd466b9 100644
--- a/.github/scripts/main/main.sh
+++ b/.github/scripts/main/main.sh
@@ -156,7 +156,7 @@ fi
 
 if [ "$OPAM_DEPENDS" = "1" ]; then
   (set +x; echo -en "::group::depends\r") 2>/dev/null
-  opam_admin_url="https://github.com/ocamlpro/opam-bundle"
+  opam_admin_url="https://github.com/ocaml-opam/opam-publish"
   if [ ! -d $CACHE/opam-admin ]; then
     git clone $opam_admin_url  $CACHE/opam-admin
   fi
diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml
index c8530e743fd..d04b2695b61 100644
--- a/.github/workflows/ci.ml
+++ b/.github/workflows/ci.ml
@@ -20,7 +20,7 @@ let ocamls = [
   "4.08.1";
 
   (* The last elements of the list after 4.14 will be used as default versions *)
-  latest_ocaml4; latest_ocaml5;
+  latest_ocaml4;
 ]
 let start_latests_ocaml = (4, 14)
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86a8c446eec..714dcdf1960 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.08.1, 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.08.1, 4.14.2 ]
       fail-fast: true
     steps:
     - name: Install bubblewrap
@@ -105,7 +105,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2 ]
       fail-fast: false
     env:
       OPAM_DEPENDS: 1
@@ -150,47 +150,3 @@ jobs:
         BASE_REF_SHA: ${{ github.event.pull_request.base.sha }}
         PR_REF_SHA: ${{ github.event.pull_request.head.sha }}
       run: bash -exu .github/scripts/main/main.sh x86_64-pc-linux-gnu
-
-####
-# Around opam tests
-####
-  Hygiene:
-    runs-on: ubuntu-22.04
-    needs: Analyse
-    steps:
-    - name: Install system's dune and ocaml packages
-      run: sudo apt install dune ocaml
-    - name: Checkout tree
-      uses: actions/checkout@v4
-    - name: src_ext/archives and opam-repository Cache
-      id: archives
-      uses: actions/cache@v4
-      with:
-        path: |
-          src_ext/archives
-          ~/opam-repository
-        key: ${{ needs.Analyse.outputs.archives }}
-        enableCrossOsArchive: true
-    - name: Get changed files
-      id: files
-      uses: Ana06/get-changed-files@v2.3.0
-    - name: Changed files list
-      run: |
-        for changed_file in ${{ steps.files.outputs.modified }}; do
-          echo "M  ${changed_file}."
-        done
-        for changed_file in ${{ steps.files.outputs.removed }}; do
-          echo "D  ${changed_file}."
-        done
-        for changed_file in ${{ steps.files.outputs.added }}; do
-          echo "A  ${changed_file}."
-        done
-        for changed_file in ${{ steps.files.outputs.renamed }}; do
-          echo "AD ${changed_file}."
-        done
-    - name: Hygiene
-      env:
-        BASE_REF_SHA: ${{ github.event.pull_request.base.sha }}
-        PR_REF_SHA: ${{ github.event.pull_request.head.sha }}
-      if: contains(steps.files.outputs.modified, 'configure.ac') || contains(steps.files.outputs.modified, 'shell/install.sh') || contains(steps.files.outputs.all, 'src_ext') || contains(steps.files.outputs.all, '.github/workflows')
-      run: bash -exu .github/scripts/main/hygiene.sh