From 4b169948327a414e3d6df82d5793bb3e5373f80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin@tarides.com>
Date: Fri, 8 Dec 2023 09:36:57 +0100
Subject: [PATCH] Build and CI updates (remove AppVeyor)

AppVeyor OCaml scripts are no longer supported.
---
 .github/workflows/main.yml |  7 ++++---
 .ocamlformat               |  2 +-
 README.md                  |  2 +-
 appveyor.yml               | 30 ------------------------------
 dune-project               |  2 --
 extunix.opam               |  1 +
 6 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dda46c0..3f8841a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,18 +13,19 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - ubuntu-latest
+          # - macos-latest
+          # - ubuntu-latest
           - windows-latest
         ocaml-compiler:
           - 4.06.x
           - 4.14.x
+          # - 5.1.x
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
         uses: ocaml/setup-ocaml@v2
diff --git a/.ocamlformat b/.ocamlformat
index ff26d09..9f6e193 100644
--- a/.ocamlformat
+++ b/.ocamlformat
@@ -1,2 +1,2 @@
 profile = default
-version = 0.22.4
+version = 0.26.1
diff --git a/README.md b/README.md
index 3f5656e..cf256b7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 ExtUnix OCaml library
 =====================
 
-[![Build status](https://ci.appveyor.com/api/projects/status/66fpgc2qol5fu30g?svg=true)](https://ci.appveyor.com/project/ygrek/extunix/branch/master)
 [![Build status](https://github.com/ygrek/extunix/actions/workflows/main.yml/badge.svg)](https://github.com/ygrek/extunix/actions)
+[![OCaml-CI Build Status](https://img.shields.io/endpoint?url=https://ocaml.ci.dev/badge/ygrek/extunix/master&logo=ocaml)](https://ocaml.ci.dev/github/ygrek/extunix)
 
 A collection of thin bindings to various low-level system API.
 
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 21dea5d..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-image:
-  - Visual Studio 2019
-
-platform:
-  - x64
-
-environment:
-  FORK_USER: ocaml
-  FORK_BRANCH: master
-  CYG_ROOT: C:\cygwin64
-  matrix:
-    - OPAM_SWITCH: 4.12.0+mingw64c
-    - OPAM_SWITCH: 4.12.0+msvc64c
-    # - OPAM_SWITCH: 4.11.2+mingw64c
-    # - OPAM_SWITCH: 4.11.2+msvc64c
-    # - OPAM_SWITCH: 4.10.2+mingw64c
-    # - OPAM_SWITCH: 4.10.2+msvc64c
-    # - OPAM_SWITCH: 4.09.1+mingw64c
-    # - OPAM_SWITCH: 4.09.1+msvc64c
-    # - OPAM_SWITCH: 4.08.1+mingw64c
-    # - OPAM_SWITCH: 4.08.1+msvc64c
-    - OPAM_SWITCH: 4.07.1+mingw64c
-    - OPAM_SWITCH: 4.07.1+msvc64c
-
-install:
-  - ps: (New-Object Net.WebClient).DownloadFile('https://cygwin.com/setup-x86_64.exe', "C:\cygwin64\setup-x86_64.exe")
-  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))
-
-build_script:
-  - call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh
diff --git a/dune-project b/dune-project
index 9adcb48..38d06a8 100644
--- a/dune-project
+++ b/dune-project
@@ -1,7 +1,6 @@
 (lang dune 3.0)
 (name extunix)
 (generate_opam_files true)
-(subst disabled)
 
 (package
  (name extunix)
@@ -44,5 +43,4 @@
  )
  (maintainers "ygrek@autistici.org" "Antonin Décimo <antonin@tarides.com>")
  (source (github ygrek/extunix))
- (bug_reports "https://github.com/ygrek/extunix/issues")
  (tags ("org:ygrek")))
diff --git a/extunix.opam b/extunix.opam
index be37baa..19a220d 100644
--- a/extunix.opam
+++ b/extunix.opam
@@ -44,6 +44,7 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"