From a4e9a1b64c4d813d5cdbeb94f9a5c9e87b087646 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Thu, 10 Aug 2023 15:51:28 +0200 Subject: [PATCH 1/3] disable building docs for old ocaml tags (#424) --- .github/workflows/gh-pages.yml | 40 ++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index fcab8f49..8396545c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -95,25 +95,27 @@ jobs: dune build @doc --only-packages=hacl-star cp -r _build/default/_doc/_html/* ../build/ocaml/main/ - - name: Build | OCaml API Reference for Tags - run: | - mkdir -p build/ocaml - for branch in $(git for-each-ref --format='%(refname)' refs/tags/); do - if [[ "$branch" == *"ocaml-"* ]]; then - rm -rf opam - tag=$(echo $branch | cut -d'/' -f 3) - git checkout $tag - echo "Building documentation for $tag" - mkdir -p build/ocaml/$tag - ./opam.sh - cd opam - eval $(opam env) - opam install . --yes - dune build @doc --only-packages=hacl-star - cp -r _build/default/_doc/_html/* ../build/ocaml/$tag/ - cd ../ - fi - done + # TODO: #423 ctypes.stubs need to be added to old tags to build documentation. + # https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf + # - name: Build | OCaml API Reference for Tags + # run: | + # mkdir -p build/ocaml + # for branch in $(git for-each-ref --format='%(refname)' refs/tags/); do + # if [[ "$branch" == *"ocaml-"* ]]; then + # rm -rf opam + # tag=$(echo $branch | cut -d'/' -f 3) + # git checkout $tag + # echo "Building documentation for $tag" + # mkdir -p build/ocaml/$tag + # ./opam.sh + # cd opam + # eval $(opam env) + # opam install . --yes + # dune build @doc --only-packages=hacl-star + # cp -r _build/default/_doc/_html/* ../build/ocaml/$tag/ + # cd ../ + # fi + # done - name: Build | JS API Reference run: | From c154cc88a54e3f0736fd2c6c9c7c65ab9d3c4717 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Fri, 11 Aug 2023 07:25:24 +0200 Subject: [PATCH 2/3] Revert "Update build.yml" This reverts commit 9fd106ba394ddb8a2afb1510d96a984448ec9e14. --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be72f818..9720bc5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,7 @@ concurrency: jobs: linux: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest strategy: matrix: @@ -91,6 +92,7 @@ jobs: name: linux_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.edition }} macos: + if: ${{ github.event_name == 'merge_group' }} runs-on: macos-latest strategy: matrix: @@ -157,6 +159,7 @@ jobs: name: macos_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.target }} windows: + if: ${{ github.event_name == 'merge_group' }} runs-on: windows-latest strategy: matrix: @@ -209,6 +212,7 @@ jobs: # ---------------------------------------------------------------------------- android: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest strategy: matrix: @@ -235,6 +239,7 @@ jobs: name: ${{ matrix.target }} s390x-gcc: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: - name: Checkout @@ -269,6 +274,7 @@ jobs: # ---------------------------------------------------------------------------- default: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: - name: Checkout From c6d3969f8930e37c5bf71e65c74b18d8f2a313f7 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Fri, 11 Aug 2023 07:28:37 +0200 Subject: [PATCH 3/3] update ci drop clang 11 on macos and add clang 15 --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9720bc5b..15a9ecdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ concurrency: jobs: linux: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest strategy: matrix: @@ -92,12 +92,12 @@ jobs: name: linux_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.edition }} macos: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: macos-latest strategy: matrix: compiler: [gcc, clang] - version: [11, 12, 13, 14] + version: [11, 12, 13, 14, 15] bits: [64] target: ["", "aarch64-apple-ios", "aarch64-apple-darwin"] exclude: @@ -105,6 +105,10 @@ jobs: version: 13 - compiler: gcc version: 14 + - compiler: gcc + version: 15 + - compiler: clang + version: 11 steps: - name: Setup | Install Ninja @@ -159,7 +163,7 @@ jobs: name: macos_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.target }} windows: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: windows-latest strategy: matrix: @@ -212,7 +216,7 @@ jobs: # ---------------------------------------------------------------------------- android: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest strategy: matrix: @@ -239,7 +243,7 @@ jobs: name: ${{ matrix.target }} s390x-gcc: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest steps: - name: Checkout @@ -274,7 +278,7 @@ jobs: # ---------------------------------------------------------------------------- default: - if: ${{ github.event_name == 'merge_group' }} + if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest steps: - name: Checkout