Bring feature/perf up-to-date

.github/workflows/1.249-lcm.yml

@@ -25,15 +25,17 @@ jobs:
   ocaml-test:
     name: Ocaml tests
     runs-on: ubuntu-20.04
-    env:
-      package: "xapi-cli-protocol xapi-client xapi-consts xapi-database xapi-datamodel xapi-types xapi xe"
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           ref: '1.249-lcm'
 
+      - name: Free space
+        shell: bash
+        run: sudo rm -rf /usr/local/lib/android
+
       - name: Pull configuration from xs-opam
         run: |
           curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/release/yangtze/lcm/tools/xs-opam-ci.env | cut -f2 -d " " > .env
@@ -42,37 +44,24 @@ jobs:
         id: dotenv
         uses: falti/dotenv-action@v1
 
-      - name: Retrieve date for cache key (year-week)
-        id: cache-key
-        run: echo "date=$(/bin/date -u "+%Y%W")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Restore opam cache
-        id: opam-cache
-        uses: actions/cache@v4
-        with:
-          path: "~/.opam"
-          # invalidate cache every week, gets built using a scheduled job
-          key: ${{ steps.cache-key.outputs.date }}-1.249
-
       - name: Update Ubuntu repositories
+        shell: bash
         run: sudo apt-get update
 
       - name: Use ocaml
-        uses: avsm/setup-ocaml@v1
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ steps.dotenv.outputs.ocaml_version_full }}
-          opam-repository: ${{ steps.dotenv.outputs.repository }}
+          ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
+          opam-repositories: |
+            xs-opam: ${{ steps.dotenv.outputs.repository }}
+          dune-cache: true
 
       - name: Install dependencies
-        run: |
-          opam update
-          opam pin add . --no-action
-          opam depext -u ${{ env.package }}
-          opam upgrade
-          opam install ${{ env.package }} --deps-only --with-test -v
+        shell: bash
+        run: opam install . --deps-only --with-test -v
 
-      - name: Build
+      - name: Configure and build
+        shell: bash
         run: |
           opam exec -- ./configure
           opam exec -- make
@@ -85,4 +74,4 @@ jobs:
       - name: Avoid built packages to appear in the cache
         # only packages in this repository follow a branch, the rest point
         # to a tag
-        run: opam uninstall ${{ env.package }}
+        run: opam pin list --short | xargs opam unpin

.github/workflows/docs.yml

@@ -43,7 +43,7 @@ jobs:
           opam exec -- dune exec ocaml/xapi-storage/generator/src/main.exe -- gen_markdown --path=$STORAGE_DOCDIR
 
       - name: Deploy xapi-storage docs
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.ACTIONS_STORAGE_DEPLOY_KEY }}
           publish_dir: ${{ env.STORAGE_DOCDIR }}

.github/workflows/generate-and-build-sdks.yml

@@ -28,7 +28,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SDK_Source_C
-          path: _build/install/default/xapi/sdk/c/*
+          path: |
+            _build/install/default/xapi/sdk/c/*
+            !_build/install/default/xapi/sdk/c/dune
 
       - name: Store C# SDK source
         uses: actions/upload-artifact@v4
@@ -42,8 +44,8 @@ jobs:
           name: SDK_Source_PowerShell
           path: _build/install/default/xapi/sdk/powershell/*
 
-      - name: Cleanup XenAPI environment
-        uses: ./.github/workflows/cleanup-xapi-environment
+      - name: Trim dune cache
+        run: opam exec -- dune cache trim --size=2GiB
 
   build-c-sdk:
     name: Build C SDK
@@ -67,7 +69,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SDK_Artifacts_C
-          path: source/*
+          path: |
+            source/*
+            !source/src/*.o
 
   build-csharp-sdk:
     name: Build C# SDK

.github/workflows/hugo.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
+        uses: peaceiris/actions-hugo@v3
         with:
           hugo-version: '0.119.0'
 
@@ -24,7 +24,7 @@ jobs:
           hugo --minify
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.ACTIONS_DOCS_DEPLOY_KEY }}
           publish_dir: ./doc/public

.github/workflows/main.yml

@@ -12,115 +12,9 @@ concurrency: # On new push, cancel old workflows from the same PR, branch or tag
   cancel-in-progress: true
 
 jobs:
-  python-test:
-    name: Python tests
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["2.7", "3.11"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # To check which files changed: origin/master..HEAD
-      - uses: LizardByte/setup-python-action@master
-        with:
-          python-version: ${{matrix.python-version}}
-
-      - uses: actions/cache@v4
-        name: Setup cache for running pre-commit fast
-        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-
-      - run: echo "::add-matcher::.github/workflows/python-warning-matcher.json"
-        name: "Setup GitHub for reporting Python warnings as annotations in pull request code review"
-
-      - uses: pre-commit/action@v3.0.0
-        name: Run pre-commit checks (no spaces at end of lines, etc)
-        if: ${{ matrix.python-version != '2.7' }}
-        with:
-          extra_args: --all-files --verbose --hook-stage commit
-        env:
-          SKIP: no-commit-to-branch
-
-      - name: Install dependencies only needed for python 2
-        if: ${{ matrix.python-version == '2.7' }}
-        run: pip install enum
-
-      - name: Install dependencies only needed for python 3
-        if: ${{ matrix.python-version != '2.7' }}
-        run: pip install pandas pytype toml wrapt
-
-      - name: Install common dependencies for Python ${{matrix.python-version}}
-        run: pip install future mock pytest-coverage pytest-mock
-
-      - name: Run Pytest for python 2 and get code coverage for Codecov
-        if: ${{ matrix.python-version == '2.7' }}
-        run: >
-          pytest
-          --cov=scripts --cov=ocaml/xcp-rrdd
-          scripts/ ocaml/xcp-rrdd -vv -rA
-          --junitxml=.git/pytest${{matrix.python-version}}.xml
-          --cov-report term-missing
-          --cov-report xml:.git/coverage${{matrix.python-version}}.xml
-        env:
-          PYTHONDEVMODE: yes
-
-      - name: Run Pytest for python 3 and get code coverage for Codecov
-        if: ${{ matrix.python-version != '2.7' }}
-        run: >
-          pytest
-          --cov=scripts --cov=ocaml/xcp-rrdd --cov=python3/
-          scripts/ ocaml/xcp-rrdd python3/ -vv -rA
-          --junitxml=.git/pytest${{matrix.python-version}}.xml
-          --cov-report term-missing
-          --cov-report xml:.git/coverage${{matrix.python-version}}.xml
-        env:
-          PYTHONDEVMODE: yes
-
-      - name: Upload Python ${{matrix.python-version}} coverage report to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          directory: .git
-          files: coverage${{matrix.python-version}}.xml
-          env_vars: OS,PYTHON
-          fail_ci_if_error: false
-          flags: python${{matrix.python-version}}
-          name: coverage${{matrix.python-version}}
-          verbose: true
-
-      - uses: dciborow/action-pylint@0.1.0
-        if: ${{ matrix.python-version != '2.7' }}
-        with:
-          reporter: github-pr-review
-          level: warning
-          # To be customized to cover remaining Python scripts:
-          glob_pattern: "**/*.py"
-
-      - name: Run pytype checks
-        if: ${{ matrix.python-version != '2.7' }}
-        run: ./pytype_reporter.py
-        env:
-          PR_NUMBER: ${{ github.event.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PYTYPE_REPORTER_DEBUG: True
-
-      # Try to add pytype_report.py's summary file as a comment to the PR:
-      # Documentation: https://github.com/marketplace/actions/add-pr-comment
-      - name: Add the pytype summary as a comment to the PR (if permitted)
-        uses: mshick/add-pr-comment@v2
-        # Depends on pytype checks, which are not run for python 2.7:
-        if: ${{ matrix.python-version != '2.7' }}
-        # Fails for user workflows without permissions(fork-based pull requests):
-        continue-on-error: true
-        with:
-          message-path: .git/pytype-summary.md # Add the content of it as comment
-
   ocaml-tests:
     name: Run OCaml tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       # Ensure you also update test-sdk-builds
       # when changing this value, to keep builds
@@ -156,35 +50,5 @@ jobs:
       - name: Check disk space
         run: df -h || true
 
-      - name: Cleanup XenAPI environment
-        uses: ./.github/workflows/cleanup-xapi-environment
-
-  deprecation-test:
-    name: Deprecation tests
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Generate empty configuration for make to be happy
-        run: touch config.mk
-
-      - name: quality-gate
-        run: make quality-gate
-
-      - name: pyflakes
-        uses: reviewdog/action-pyflakes@master
-        with:
-          github_token: ${{ secrets.github_token }}
-          reporter: github-pr-review
-          level: error
-
-  test-sdk-builds:
-    name: Test SDK builds
-    uses: ./.github/workflows/generate-and-build-sdks.yml
-    with:
-      # Ensure you also update ocaml-tests
-      # when changing this value, to keep builds
-      # consistent
-      xapi_version: "v0.0.0"
+      - name: Trim dune cache
+        run: opam exec -- dune cache trim --size=2GiB