diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml index f4cb0b54169..55808f635b1 100644 --- a/.github/workflows/ci.ml +++ b/.github/workflows/ci.ml @@ -324,7 +324,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w ~cond:(Predicate(true, EndsWith("matrix.host", "-pc-windows"))) ~withs:[ ("name", Literal ["opam-exe-${{ matrix.host }}-${{ matrix.ocamlv }}-${{ matrix.build }}"]); ("path", Literal ["D:\\Local\\bin\\opam.exe"; "D:\\Local\\bin\\opam-installer.exe"; "D:\\Local\\bin\\opam-putenv.exe"]) ] - "actions/upload-artifact@v3") + "actions/upload-artifact@v4") ++ only_on Windows (run "Test (basic - Cygwin)" ~cond:(Predicate(true, EndsWith("matrix.host", "-pc-cygwin"))) ["bash -exu .github/scripts/main/test.sh"]) ++ only_on Windows (run "Test (basic - native Windows)" ~env:[("OPAMROOT", {|D:\a\opam\opam\.opam|})] ~shell:"cmd" ~cond:(Predicate(false, EndsWith("matrix.host", "-pc-cygwin"))) ({|set Path=D:\Cache\ocaml-local\bin;%Path%|} :: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5ef1461449..4d7d9624140 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -193,7 +193,7 @@ jobs: run: ldd ./opam.exe | test "$(grep -v -F /cygdrive/c/Windows/)" = '' - name: Upload opam binaries for Windows if: endsWith(matrix.host, '-pc-windows') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: opam-exe-${{ matrix.host }}-${{ matrix.ocamlv }}-${{ matrix.build }} path: | diff --git a/master_changes.md b/master_changes.md index a0347477cbd..3d0a0e96851 100644 --- a/master_changes.md +++ b/master_changes.md @@ -121,6 +121,7 @@ users) * Use actions/cache instead of our own fork ocaml-opam/cache [#6081 @rjbou] * Update action cache to v4 [#6081 @rjbou] * Update action checkout to v4 [#6081 @rjbou] + * Update action upload-artifact to v4 [#6081 @rjbou] ## Doc