From 18db1a94e18d4b0f621c9b638982e60b7022a81b Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 19 Apr 2021 19:48:26 -0700 Subject: [PATCH 1/5] Build 32bit on CI fixes #151 --- .dockerignore | 6 ++++++ .github/workflows/test_32bit.yml | 11 +++++++++++ Dockerfile.32bit | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 .dockerignore create mode 100644 .github/workflows/test_32bit.yml create mode 100644 Dockerfile.32bit diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..6ebaa5ae --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +_build +.git +async +mirage +h2-async.opam +h2-mirage.opam diff --git a/.github/workflows/test_32bit.yml b/.github/workflows/test_32bit.yml new file mode 100644 index 00000000..ac3cb8f8 --- /dev/null +++ b/.github/workflows/test_32bit.yml @@ -0,0 +1,11 @@ +name: 'Build & Test (32 bit)' +on: + pull_request: + push: + branches: + - master +runs: + using: 'docker' + image: 'Dockerfile' + args: + - ${{ inputs.who-to-greet }} diff --git a/Dockerfile.32bit b/Dockerfile.32bit new file mode 100644 index 00000000..1d3ec89b --- /dev/null +++ b/Dockerfile.32bit @@ -0,0 +1,17 @@ +# https://discuss.ocaml.org/t/how-to-generate-a-32-bit-binary-on-a-64-bit-system/6163/6 +FROM ocurrent/opam@sha256:e7a75342370514e1adf20c6c95102bb37dddefd5ad205c457e4aa72012283960 + +WORKDIR /home/opam/src + +RUN sudo apt-get update && sudo apt-get upgrade -y +RUN sudo apt-get install vim -y + +RUN opam update && opam upgrade + +RUN opam depext conf-pkg-config conf-gmp conf-m4 +RUN opam install h2 h2-lwt-unix --deps-only -t + +COPY --chown=opam . /home/opam/src + +# ENTRYPOINT + From 3389c97bb81236fa50bce5a3088cff705dc6169a Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 19 Apr 2021 19:49:45 -0700 Subject: [PATCH 2/5] try this --- .github/workflows/test_32bit.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_32bit.yml b/.github/workflows/test_32bit.yml index ac3cb8f8..ea73708a 100644 --- a/.github/workflows/test_32bit.yml +++ b/.github/workflows/test_32bit.yml @@ -4,8 +4,7 @@ on: push: branches: - master -runs: - using: 'docker' - image: 'Dockerfile' - args: - - ${{ inputs.who-to-greet }} +jobs: + runs: + using: 'docker' + image: 'Dockerfile.32bit' From 58b5631b10e87f9b22ef88b68f6ab0550f03346c Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 19 Apr 2021 19:55:45 -0700 Subject: [PATCH 3/5] How about now? --- .github/workflows/test_32bit.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/test_32bit.yml b/.github/workflows/test_32bit.yml index ea73708a..d867dfb1 100644 --- a/.github/workflows/test_32bit.yml +++ b/.github/workflows/test_32bit.yml @@ -8,3 +8,26 @@ jobs: runs: using: 'docker' image: 'Dockerfile.32bit' + + +jobs: + docker-32bit: + runs-on: ubuntu-latest + container: + image: ocurrent/opam@sha256:e7a75342370514e1adf20c6c95102bb37dddefd5ad205c457e4aa72012283960 + steps: + - uses: actions/checkout@v2 + - name: Print the result of `uname -a` + run: uname -a + - name: apt-get update + run: sudo apt-get update && sudo apt-get upgrade -y + - name: opam update + run: opam update && opam upgrade + - name: opam depext conf-pkg-config conf-gmp conf-m4 + run: opam pin add . -n + - name: Install OPAM dependencies + run: opam install -y --deps-only . -t + - name: + run: opam install -y --deps-only . -t + - name: + run: opam exec -- dune runtest From 4352544fc51a5a1cec6920d92e4e2fa768eb5148 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 19 Apr 2021 19:56:17 -0700 Subject: [PATCH 4/5] more --- .github/workflows/test_32bit.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test_32bit.yml b/.github/workflows/test_32bit.yml index d867dfb1..6875dba4 100644 --- a/.github/workflows/test_32bit.yml +++ b/.github/workflows/test_32bit.yml @@ -4,11 +4,6 @@ on: push: branches: - master -jobs: - runs: - using: 'docker' - image: 'Dockerfile.32bit' - jobs: docker-32bit: From d5638553344be2bfe38757bd45ac8c77d92082af Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 19 Apr 2021 20:08:33 -0700 Subject: [PATCH 5/5] lol? --- .github/workflows/test_32bit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_32bit.yml b/.github/workflows/test_32bit.yml index 6875dba4..9bd261bc 100644 --- a/.github/workflows/test_32bit.yml +++ b/.github/workflows/test_32bit.yml @@ -11,7 +11,7 @@ jobs: container: image: ocurrent/opam@sha256:e7a75342370514e1adf20c6c95102bb37dddefd5ad205c457e4aa72012283960 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 - name: Print the result of `uname -a` run: uname -a - name: apt-get update