Skip to content

Commit

Permalink
Merge pull request #5852 from rjbou/gha2
Browse files Browse the repository at this point in the history
gha: update checkout to v4
  • Loading branch information
rjbou authored Feb 23, 2024
2 parents 87a88a5 + 2175f6e commit b5dba01
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lib.ml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ let uses name ?id ?cond ?(continue_on_error=false) ?(withs=[]) action ~oc ~workf
f ~oc ~workflow ~job

let checkout ?cond () =
uses "Checkout tree" ?id:None ?cond "actions/checkout@v3"
uses "Checkout tree" ?id:None ?cond "actions/checkout@v4"

let skip_step ~oc ~workflow ~job f = f ~oc ~workflow ~job

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
opam-bs-cache: ${{ steps.keys.outputs.opam-bs-cache }}
steps:
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Determine cache keys
id: keys
run: |
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
force-gzip: true
- name: Checkout tree
if: steps.cygwin64.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Create Cygwin64 cache
if: steps.cygwin64.outputs.cache-hit != 'true'
shell: cmd
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Install bubblewrap
run: sudo apt install bubblewrap
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
git config --system core.autocrlf false
git config --system core.eol lf
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cygwin64 Cache
id: cygwin64
if: matrix.build == 'x86_64-pc-cygwin'
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
fail-fast: true
steps:
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
OPAM_TEST: 1
steps:
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install bubblewrap
run: sudo apt install bubblewrap
- name: src_ext/archives and opam-repository Cache
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
- name: Install gnu coreutils
run: brew install coreutils
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -377,7 +377,7 @@ jobs:
- name: Install bubblewrap
run: sudo apt install bubblewrap
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
- name: Install bubblewrap
run: sudo apt install bubblewrap
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -459,7 +459,7 @@ jobs:
OPAMBSROOT: ~/.cache/opam.${{ matrix.solver }}.cached
steps:
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down Expand Up @@ -506,7 +506,7 @@ jobs:
- name: Install bubblewrap
run: sudo apt install bubblewrap
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam 1.2 root Cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -537,7 +537,7 @@ jobs:
fail-fast: false
steps:
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: opam 1.2 root Cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -569,7 +569,7 @@ jobs:
- name: Install system's dune and ocaml packages
run: sudo apt install dune ocaml
- name: Checkout tree
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: src_ext/archives and opam-repository Cache
id: archives
uses: ocaml-opam/cache@opam
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ users)
### Engine

## Github Actions
* Update checkout action to v4 [#5851 @rjbou]

## Doc
* Fix a typo in the documentation of `opam lint --recursive` [#5812 @Khady]
Expand Down

0 comments on commit b5dba01

Please sign in to comment.