From fdfe1c6e15a82fab31db8da0ad99c39e2c4cae88 Mon Sep 17 00:00:00 2001 From: Seb Hinderer Date: Wed, 29 Oct 2025 10:46:01 +0100 Subject: [PATCH 1/4] Remove the windows GitHub action It was disabled and its contents does not look very useful any longer. --- .github/workflows/windows.yml.disabled | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/windows.yml.disabled diff --git a/.github/workflows/windows.yml.disabled b/.github/workflows/windows.yml.disabled deleted file mode 100644 index 962728e..0000000 --- a/.github/workflows/windows.yml.disabled +++ /dev/null @@ -1,18 +0,0 @@ -name: windows -on: [push] -jobs: - build-windows: - runs-on: windows-latest - steps: - - name: Setup Cygwin and mingw64 - run: | - choco install cygwin - # patch is needed for opam - choco install --source cygwin rsync patch diffutils curl make unzip git m4 perl mingw64-x86_64-gcc-core mingw64-x86_64-gcc-g++ - - name: Setup opam - run: | - $env:PATH = 'C:\tools\cygwin\usr\local\bin;C:\tools\cygwin\bin;' + $env:PATH - curl -o opam64.tar.xz -L https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz - tar -xf opam64.tar.xz - bash opam64/install.sh - opam init default "https://github.com/fdopen/opam-repository-mingw.git#opam2" -c "ocaml-variants.4.14.0+mingw64c" --disable-sandboxing From 53561abbf0dbbf5130c55c3438be8c0e4d4686d5 Mon Sep 17 00:00:00 2001 From: Seb Hinderer Date: Wed, 29 Oct 2025 10:48:08 +0100 Subject: [PATCH 2/4] Remove the commented build-ubuntu-ocaml-5-beta job from the main workflow No longer needed --- .github/workflows/main.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f37562..fc7da2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,27 +64,3 @@ jobs: - name: Make stdcompat run: | opam exec -- sh -xc ".github/scripts/build-${{ matrix.builder }}.sh" - -# build-ubuntu-ocaml-5-beta: -# strategy: -# fail-fast: false -# matrix: -# builder: -# - dune -# - make -# - make-no-magic -# runs-on: ubuntu-latest -# container: -# image: ghcr.io/thierry-martinez/stdcompat-ocaml-5-beta -# credentials: -# username: ${{ github.actor }} -# password: ${{ secrets.packages_actions_read }} -# steps: -# - name: Checkout -# uses: actions/checkout@v3 -# - name: Make stdcompat -# run: | -# chown -R ci $PWD && \ -# su ci -c "sh -xc \".github/scripts/build-in-docker.sh \ -# 5.0.0~alpha1 \ -# \\\"${{ matrix.builder }}\\\"\"" From 16a65afb238e9f1c089b39ca3bf4063c3568f0b1 Mon Sep 17 00:00:00 2001 From: Seb Hinderer Date: Wed, 29 Oct 2025 10:49:46 +0100 Subject: [PATCH 3/4] Add the OCaml 5.3 compiler to the check-generated-files workflow It had been forgotten --- .github/workflows/check-generated-files.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 920d9b0..9f812b2 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -44,6 +44,7 @@ jobs: - 5.0.x - 5.1.x - 5.2.x + - 5.3.x runs-on: ${{ matrix.os }} steps: - name: Checkout From 95ff61821397b0ed85a26f7b1cb33bd26e34eb3f Mon Sep 17 00:00:00 2001 From: Seb Hinderer Date: Wed, 29 Oct 2025 10:53:16 +0100 Subject: [PATCH 4/4] Update the used version of the checkout GHA from v4 to v5 --- .github/workflows/check-generated-files.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 9f812b2..906cc52 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup OCaml uses: ocaml/setup-ocaml@v3 with: @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup OCaml uses: ocaml/setup-ocaml@v3 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc7da2b..7e0a3be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup OCaml uses: ocaml/setup-ocaml@v3 with: @@ -56,7 +56,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup OCaml uses: ocaml/setup-ocaml@v3 with: