Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
franziskuskiefer committed Aug 11, 2023
2 parents 1575f26 + c6d3969 commit c4310ac
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 20 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ concurrency:

jobs:
linux:
if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -91,18 +92,23 @@ jobs:
name: linux_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.edition }}

macos:
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:
- compiler: gcc
version: 13
- compiler: gcc
version: 14
- compiler: gcc
version: 15
- compiler: clang
version: 11

steps:
- name: Setup | Install Ninja
Expand Down Expand Up @@ -157,6 +163,7 @@ jobs:
name: macos_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.target }}

windows:
if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
runs-on: windows-latest
strategy:
matrix:
Expand Down Expand Up @@ -209,6 +216,7 @@ jobs:
# ----------------------------------------------------------------------------

android:
if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -235,6 +243,7 @@ jobs:
name: ${{ matrix.target }}

s390x-gcc:
if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -269,6 +278,7 @@ jobs:
# ----------------------------------------------------------------------------

default:
if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
40 changes: 21 additions & 19 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit c4310ac

Please sign in to comment.