Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GHA: bump version of actions #6081

Merged
merged 4 commits into from
Aug 8, 2024
Merged

GHA: bump version of actions #6081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e2ad46
gha: remove ocaml-opam cache action, switch to main actions/cache one…
rjbou Jul 9, 2024
2fffc3e
gha: update action cache to v4
rjbou Jul 9, 2024
935c15a
gha: update action checkout to v4
rjbou Jul 9, 2024
a07027e
gha: update upload-artifact action to v4
rjbou Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/ci.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,15 @@ let get_cache name = get_cache_cont name Fun.id

let cache ?cond ?(key_prefix="needs.Analyse") ?(check_only=false) name =
get_cache_cont name (fun cache ->
let action =
if cache.force_gzip || check_only then
"ocaml-opam/cache@opam"
else
"actions/cache@v3"
in
let action = "actions/cache@v4" in
let withs =
if cache.force_gzip then
[("force-gzip", Literal ["true"])]
[("enableCrossOsArchive", Literal ["true"])]
else
[] in
let withs =
if check_only then
("check-only", Literal ["true"]) :: withs
("lookup-only", Literal ["true"]) :: withs
else
withs in
let withs =
Expand Down Expand Up @@ -329,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%|} ::
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/depexts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- name: opam binary cache
id: binary
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -43,9 +43,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -61,9 +61,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -79,9 +79,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -97,9 +97,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -115,9 +115,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -133,9 +133,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -151,9 +151,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -169,9 +169,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand All @@ -187,9 +187,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam binary cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: binary/opam
key: binary-${{ env.OPAMVERSION }}
Expand Down
Loading
Loading