diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 920d9b0..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: @@ -44,10 +44,11 @@ jobs: - 5.0.x - 5.1.x - 5.2.x + - 5.3.x 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 7f37562..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: @@ -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 }}\\\"\"" 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