Merge pull request #704 from psafont/reorg

Change repository to use the default, upstream file layout

Author: psafont

.github/duplicates-xs-toolstack.txt

@@ -17,6 +17,7 @@ LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception
 LGPL-2.1-only WITH OCaml-LGPL-linking-exception
 LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception AND BSD-3-Clause
+LGPL-3.0-only
 LGPL-3.0-only WITH OCaml-LGPL-linking-exception
 LGPL-2.1-or-later WITH OpenSSL-linking-exception
 GPL-2.0-or-later

.github/duplicates-upstream-extra.txt .github/duplicates.txt

@@ -0,0 +1,10 @@
+host-arch-x86_64
+host-system-other
+logs-syslog
+memtrace
+ocaml-options-vanilla
+ocaml-system
+opam-depext
+syslog-message
+trace
+tyre

.github/known-licenses.txt

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ocaml-version: ["4.14.1", "4.14.2"]
+        ocaml-version: ["4.14.2"]
         experimental: [false]
           # include:
           # - ocaml-version: "5.2.0"
@@ -47,7 +47,7 @@ jobs:
           echo "XDG_CACHE_HOME=${XDG_CACHE_HOME}" >>"$GITHUB_ENV"
 
       - name: Use ocaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-version }}
           opam-repositories: |
@@ -67,26 +67,15 @@ jobs:
         run: tools/license-check.sh
 
       - name: Build xs-toolstack, test its dependencies
-        # opam install may ignore installing depexts sometimes
         run: |
-          opam list -s --required-by xs-toolstack | xargs opam depext -tu
           opam list -s --required-by xs-toolstack | xargs opam install -t
         env:
           # OPAMCOLOR is set to "always" by default and it breaks piping
           OPAMCOLOR: NEVER
           OPAMERRLOGLEN: 10000
 
-      - name: Uninstall unversioned packages
-        # This should purge them from the cache, unversioned package have
-        # 'master' as its version
-        run: opam list | awk -F " " '$2 == "master" { print $1 }' |  xargs opam uninstall
-        env:
-          # OPAMCOLOR is set to "always" by default and it breaks piping
-          OPAMCOLOR: NEVER
-          OPAMERRLOGLEN: 10000
-
       - name: Install developer tools
-        run: opam install upstream-extra-dummy
+        run: opam install dev-tools
 
       - name: Print disk usage
         shell: bash

.github/unused-packages.txt

@@ -14,7 +14,14 @@ jobs:
         fetch-depth: 0
 
     - name: Install opam
-      run: sudo apt-get install -y opam
+      uses: ocaml/setup-ocaml@v3
+      with:
+        ocaml-compiler: "4.14.2"
+        opam-repositories: |
+          xs-opam: "."
+        opam-pin: false
+        dune-cache: true
+        allow-prerelease-opam: true
 
     - name: Collect licenses
       run: ./tools/print-licenses.sh > licenses.txt

.github/unused-upstream.txt

@@ -13,15 +13,19 @@ all:
 archive: $(NAME).tar.gz
 
 $(NAME).tar.gz:
-	# Add only upstream and xs pkgs into cache, add ocaml ones to metadata
-	mkdir -p stash/ocaml
-	mv packages/{upstream-extra,xs-extra,xs-extra-dummy} stash
-	mv packages/ocaml/ocaml-base-compiler.* stash/ocaml
-	env OPAMFETCH=curl opam admin cache |& tee cache.log
+	# Remove unneeded packages (like dev tools), and retain special packages
+	opam admin filter --recursive --required-by xs-toolstack --or host-system-other -y
+	# Remove all xapi dev packages
+	opam admin filter '*.master' --remove -y
+	# Remove compilable ocaml versions
+	opam admin filter 'ocaml-base-compiler' --remove -y
+	# Remove xen-related packages, the libraries are built by the xen package
+	opam admin filter 'conf-xen' --remove -y
+	opam admin cache |& tee cache.log
 	! grep ERROR cache.log
 	tar zcf $@ --transform "flags=r;s|^|$(NAME)/|" cache packages tools repo
-	cp -R stash/* packages/
-	rm -R stash/
+	# restore removed packages
+	git checkout -- packages
 
 # report licenses of xs-toolstack from *installed* packages
 licenses:

.github/unused-xs.txt

@@ -5,6 +5,7 @@ authors:        "Christian Lindig <christian.lindig@citrix.com>"
 homepage:       "https://github.com/xapi-project/xs-opam"
 license:        "BSD-2-Clause"
 synopsis: "Metapackage to install all developer tools recomemnded for developing xapi"
+tags: ["org:xapi-project" "dummy"]
 depends: [
   "merge-fmt"
   "merlin"