From 6e54cf5fc5a4e85ab943511891f16080b4c61a38 Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 10:47:20 +0200 Subject: change HOME env var, more testing... --- .github/isabelle-action/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/isabelle-action/Dockerfile b/.github/isabelle-action/Dockerfile index a6caa79..34f4fc6 100644 --- a/.github/isabelle-action/Dockerfile +++ b/.github/isabelle-action/Dockerfile @@ -16,10 +16,11 @@ ADD https://isabelle.in.tum.de/dist/Isabelle2020_linux.tar.gz Isabelle.tar.gz RUN ls RUN tar xzf Isabelle.tar.gz &&\ mv Isabelle2020 Isabelle &&\ - perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings &&\ + perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$HOME/.isabelle",g;' Isabelle/etc/settings &&\ perl -pi -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=Pure,g;' Isabelle/etc/settings &&\ Isabelle/bin/isabelle build -o system_heaps -b Pure &&\ rm Isabelle.tar.gz +RUN ls ENTRYPOINT [ "sh", "-c", "ls" ] -- cgit v1.2.3 From 66b180a3b9a6dc63869f28f3b98a487933452556 Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 10:51:26 +0200 Subject: check home var --- .github/isabelle-action/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/isabelle-action/Dockerfile b/.github/isabelle-action/Dockerfile index 34f4fc6..fe6bc48 100644 --- a/.github/isabelle-action/Dockerfile +++ b/.github/isabelle-action/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get -y update &&\ # Isabelle -RUN echo $USER_HOME +RUN echo $HOME ADD https://isabelle.in.tum.de/dist/Isabelle2020_linux.tar.gz Isabelle.tar.gz RUN ls RUN tar xzf Isabelle.tar.gz &&\ -- cgit v1.2.3 From 877b9511e2ffbef518dbc92ac6a8ec98559f69f4 Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 11:03:22 +0200 Subject: test --- .github/isabelle-action/Dockerfile | 12 +++++------- .github/isabelle-action/entrypoint.sh | 5 +++++ .github/workflows/ci.yml | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .github/isabelle-action/entrypoint.sh diff --git a/.github/isabelle-action/Dockerfile b/.github/isabelle-action/Dockerfile index fe6bc48..20b250d 100644 --- a/.github/isabelle-action/Dockerfile +++ b/.github/isabelle-action/Dockerfile @@ -3,24 +3,22 @@ FROM ubuntu SHELL ["/bin/bash", "-c"] -# Packages +# Install packages ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -y update &&\ apt-get install -y curl less libfontconfig1 libgomp1 libwww-perl rlwrap unzip &&\ apt-get clean - -# Isabelle -RUN echo $HOME +# Set up Isabelle ADD https://isabelle.in.tum.de/dist/Isabelle2020_linux.tar.gz Isabelle.tar.gz -RUN ls RUN tar xzf Isabelle.tar.gz &&\ mv Isabelle2020 Isabelle &&\ perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$HOME/.isabelle",g;' Isabelle/etc/settings &&\ perl -pi -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=Pure,g;' Isabelle/etc/settings &&\ Isabelle/bin/isabelle build -o system_heaps -b Pure &&\ rm Isabelle.tar.gz -RUN ls -ENTRYPOINT [ "sh", "-c", "ls" ] +# Set up entrypoint +RUN chmod +x entrypoint.sh +ENTRYPOINT ["entrypoint.sh"] diff --git a/.github/isabelle-action/entrypoint.sh b/.github/isabelle-action/entrypoint.sh new file mode 100644 index 0000000..954226a --- /dev/null +++ b/.github/isabelle-action/entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +chmod +x /Isabelle/bin/isabelle +sh -c "/Isabelle/bin/isabelle $INPUT_TOOL_ARGS" + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b9f617..36b01ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,5 +9,5 @@ jobs: - uses: actions/checkout@v1 - uses: ./.github/isabelle-action with: - TOOL_ARGS: "build -D ." + TOOL_ARGS: "build -D $GITHUB_WORKSPACE" -- cgit v1.2.3 From f510ca75c5b01528840a0331012ef10a5545012b Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 11:06:19 +0200 Subject: fix path --- .github/isabelle-action/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/isabelle-action/Dockerfile b/.github/isabelle-action/Dockerfile index 20b250d..2c7af73 100644 --- a/.github/isabelle-action/Dockerfile +++ b/.github/isabelle-action/Dockerfile @@ -19,6 +19,7 @@ RUN tar xzf Isabelle.tar.gz &&\ rm Isabelle.tar.gz # Set up entrypoint -RUN chmod +x entrypoint.sh -ENTRYPOINT ["entrypoint.sh"] +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] -- cgit v1.2.3 From 9eb4aeb3c2cfeb9bba05e7cf34976946a4d29677 Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 11:11:13 +0200 Subject: final test push --- .github/isabelle-action/Dockerfile | 1 + .github/workflows/ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/isabelle-action/Dockerfile b/.github/isabelle-action/Dockerfile index 2c7af73..34a4adf 100644 --- a/.github/isabelle-action/Dockerfile +++ b/.github/isabelle-action/Dockerfile @@ -23,3 +23,4 @@ COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36b01ec..415afd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push jobs: build: name: build ROOT + description: "Build repository ROOT file" runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From 00463d770fd738749c092829e3b49e4f7d25f75e Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Fri, 17 Jul 2020 11:12:00 +0200 Subject: looks like descriptions not allowed in workflow job yaml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 415afd1..36b01ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push jobs: build: name: build ROOT - description: "Build repository ROOT file" runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 -- cgit v1.2.3