diff --git a/.github/coq-concert.opam.locked b/.github/coq-concert.opam.locked index 536cf818..262a855d 100644 --- a/.github/coq-concert.opam.locked +++ b/.github/coq-concert.opam.locked @@ -21,7 +21,7 @@ depends: [ "coq-metacoq-utils" {= "1.3.3+8.19"} "coq-rust-extraction" {= "0.1.0"} "coq-elm-extraction" {= "0.1.0"} - "coq-quickchick" {= "2.0.4"} + "coq-quickchick" {= "2.1.0"} "coq-stdpp" {= "1.10.0"} ] build: [ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c973de2..bc60e806 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,32 +33,34 @@ env: JOBS: 4 jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: write steps: - name: Checkout branch ${{ github.ref_name }} uses: actions/checkout@v4 + - name: Set up OCaml + uses: ocaml/setup-ocaml@v3 + with: + ocaml-compiler: ${{env.OCAML_COMILER_VERSION}} + opam-repositories: | + coq-released: https://coq.inria.fr/opam/released + default: https://opam.ocaml.org + opam-pin: false + - run: sudo apt-get update - name: Restore opam cache id: opam-cache uses: actions/cache@v4 with: - path: "~/.opam" + path: ${{github.workspace}}/_opam key: opam-${{env.OCAML_COMILER_VERSION}}-${{hashFiles('.github/coq-concert.opam.locked')}} restore-keys: | opam-${{env.OCAML_COMILER_VERSION}}- - - name: Set up OCaml - uses: avsm/setup-ocaml@v1 - with: - ocaml-version: ${{env.OCAML_COMILER_VERSION}} - - name: Build dependencies - #if: ${{ !steps.opam-cache.outputs.cache-hit }} run: | - opam repo add coq-released https://coq.inria.fr/opam/released opam install --deps-only -j${{ env.JOBS }} .github/coq-concert.opam.locked opam install -y -j${{ env.JOBS }} coq-dpdgraph opam clean -a -c -s --logs @@ -144,10 +146,10 @@ jobs: path: extraction/tests/extracted-code - name: Set up Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@v1 with: toolchain: 1.69.0 - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Set up Concordium tools run: | curl -L -O https://distribution.concordium.software/tools/linux/cargo-concordium_1.0.0 diff --git a/.github/workflows/lint-opam.yml b/.github/workflows/lint-opam.yml index 4af9ebe8..e94626c0 100644 --- a/.github/workflows/lint-opam.yml +++ b/.github/workflows/lint-opam.yml @@ -9,6 +9,9 @@ concurrency: cancel-in-progress: true permissions: contents: read +env: + OCAML_COMILER_VERSION: "4.14.2" + JOBS: 4 jobs: lint: runs-on: ubuntu-latest @@ -18,7 +21,7 @@ jobs: - name: Set up opam uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: 4.14.x + ocaml-compiler: ${{env.OCAML_COMILER_VERSION}} opam-repositories: | coq-released: https://coq.inria.fr/opam/released default: https://opam.ocaml.org diff --git a/.github/workflows/refresh-cache.yml b/.github/workflows/refresh-cache.yml index ef5eaa73..74b53752 100644 --- a/.github/workflows/refresh-cache.yml +++ b/.github/workflows/refresh-cache.yml @@ -10,9 +10,10 @@ permissions: contents: read env: OCAML_COMILER_VERSION: "4.14.2" + JOBS: 4 jobs: cache: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout branch ${{ github.ref_name }} uses: actions/checkout@v4 @@ -22,14 +23,18 @@ jobs: id: opam-cache uses: actions/cache@v4 with: - path: "~/.opam" + path: ${{github.workspace}}/_opam fail-on-cache-miss: true key: opam-${{env.OCAML_COMILER_VERSION}}-${{hashFiles('.github/coq-concert.opam.locked')}} restore-keys: | opam-${{env.OCAML_COMILER_VERSION}}- - name: Set up OCaml - uses: avsm/setup-ocaml@v1 + uses: ocaml/setup-ocaml@v3 with: - ocaml-version: ${{env.OCAML_COMILER_VERSION}} + ocaml-compiler: ${{env.OCAML_COMILER_VERSION}} + opam-repositories: | + coq-released: https://coq.inria.fr/opam/released + default: https://opam.ocaml.org + opam-pin: false - run: opam list diff --git a/coq-concert.opam b/coq-concert.opam index e4638f44..17dfa3e1 100644 --- a/coq-concert.opam +++ b/coq-concert.opam @@ -3,7 +3,7 @@ name: "coq-concert" version: "dev" synopsis: "A framework for smart contract verification in Coq" description: """ -A framework for smart contract verification in Coq +A framework for smart contract verification in Coq """ maintainer: "Danil Annenkov " authors: "The COBRA team" diff --git a/test b/test new file mode 100644 index 00000000..e69de29b