From 2983be20d766900e0fd4dc503b8a1202d36a3b86 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 5 Mar 2021 19:24:00 -0800 Subject: [PATCH 1/8] Bump ghc version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b330e2ac..b812acb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV GHCVER 8.10.4 +ENV GHCVER 9.0.1 # NOTE: also update debian-bootstrap.sh when cuda version changes ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin From ceaa6825ab60464a0887a7731f3caf6328b6ea32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 22:17:53 +0800 Subject: [PATCH 2/8] add GH workflow action to create the build image Based on https://github.com/fpco/stackage-server/blob/master/.github/workflows/base.yml Image is pushed to docker.pkg.github.com. Later we should switch from docker to current beta container registry ghcr.io --- .github/workflows/image.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/image.yml diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml new file mode 100644 index 00000000..03a055a7 --- /dev/null +++ b/.github/workflows/image.yml @@ -0,0 +1,25 @@ +name: image + +on: + push: + branches: + - nightly + - lts18 + +jobs: + push: + runs-on: ubuntu-latest + if: github.event_name == 'push' + + steps: + - uses: actions/checkout@v2 + + - name: Log into Github registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + + - name: Build image + run: | + IMAGE_ID=docker.pkg.github.com/${{ github.repository }}:${{ github.branch }} + docker build . -f Dockerfile --tag $IMAGE_ID + docker push $IMAGE_ID + echo Pushed new build image $IMAGE_ID From 14f4d3b79fd2c67396f14cbffdce6a8352bb6416 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 22:59:33 +0800 Subject: [PATCH 3/8] GH image: fix branch tag --- .github/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 03a055a7..5143e8ed 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -19,7 +19,7 @@ jobs: - name: Build image run: | - IMAGE_ID=docker.pkg.github.com/${{ github.repository }}:${{ github.branch }} + IMAGE_ID=docker.pkg.github.com/${{ github.repository }}:${GITHUB_REF#refs/heads/} docker build . -f Dockerfile --tag $IMAGE_ID docker push $IMAGE_ID echo Pushed new build image $IMAGE_ID From 113a8313db0924fa6995a2bb4ec36867ae8d16d3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 23:29:38 +0800 Subject: [PATCH 4/8] github docker registry requires image name below repository name name unknown: docker image push is only supported with a tag of the format :owner/:repo_name/:image_name. Please add an image name to "commercialhaskell/stackage" tag. e.g. "commercialhaskell/stackage/" --- .github/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 5143e8ed..71c917fd 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -19,7 +19,7 @@ jobs: - name: Build image run: | - IMAGE_ID=docker.pkg.github.com/${{ github.repository }}:${GITHUB_REF#refs/heads/} + IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/build:${GITHUB_REF#refs/heads/} docker build . -f Dockerfile --tag $IMAGE_ID docker push $IMAGE_ID echo Pushed new build image $IMAGE_ID From 37809469d0dcdbd050283eaadccba7e473b7447a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 23:35:33 +0800 Subject: [PATCH 5/8] GH check action: try restricting to the master branch --- .github/workflows/check.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fd44bcd8..4a888d3e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,5 +1,9 @@ name: check -on: [push,pull_request] +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: build: runs-on: ubuntu-latest From cbf8070e3a3826f7a6ac184d31fbbf7e75210f06 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 23:37:03 +0800 Subject: [PATCH 6/8] debian-bootstrap.sh: binaryen now bundles the C++ source --- debian-bootstrap.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index ca1d5838..ebcfbc08 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -301,19 +301,6 @@ wget -qO - https://packages.confluent.io/deb/5.2/archive.key | apt-key add - add-apt-repository "deb https://packages.confluent.io/deb/5.2 stable main" apt-get update && apt install -y librdkafka-dev -# Install binaryen -curl -L https://github.com/WebAssembly/binaryen/archive/version_94.tar.gz | tar xz -C /tmp -pushd /tmp/binaryen-version_94 -mkdir build -cd build -cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -G "Unix Makefiles" \ - .. -sudo make install -popd - Z3_VER=4.8.8 ( cd /usr/local/ \ From c7984e5f558842908277645c28ca81b37fffa9a3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Jun 2021 00:06:03 +0800 Subject: [PATCH 7/8] build.sh: use the new build image on docker.pkg.github.com --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index c9645314..ac39ec81 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -19,7 +19,7 @@ else WORKDIR=$ROOT/work/$TAG fi -IMAGE=commercialhaskell/stackage:$TAG +IMAGE=docker.pkg.github.com/commercialhaskell/stackage/build:$TAG PANTRY_DIR=$ROOT/work/stack/pantry STACK_DIR=$ROOT/work/stack From 980fe4f5a3d987ba99a4b7dd875259052d2a0be8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Jun 2021 00:20:05 +0800 Subject: [PATCH 8/8] Revert using docker.pkg.github.com image until can be pulled This reverts commit c7984e5f558842908277645c28ca81b37fffa9a3. Currently it is private [skip ci] --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index ac39ec81..c9645314 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -19,7 +19,7 @@ else WORKDIR=$ROOT/work/$TAG fi -IMAGE=docker.pkg.github.com/commercialhaskell/stackage/build:$TAG +IMAGE=commercialhaskell/stackage:$TAG PANTRY_DIR=$ROOT/work/stack/pantry STACK_DIR=$ROOT/work/stack