From a2f0e3eefd3a975b994ebecbcdfb7b5a07fc330d Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 14:35:15 +0530 Subject: [PATCH 1/9] Update pantry to use new casa urls --- stack.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stack.yaml b/stack.yaml index fd33610..2ae44a1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,5 +6,9 @@ extra-deps: - unliftio-core-0.1.2.0 - yesod-gitrepo-0.3.0 +extra-deps: +- git: https://github.com/commercialhaskell/pantry.git + commit: 0b01e48c1856c5e8fe227495e075d324b7f0a613 + drop-packages: - Cabal From cfc35aff79801a70e6086740345479d5fadec444 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 14:36:43 +0530 Subject: [PATCH 2/9] Run CI --- .github/workflows/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml index 2cf1bf3..91c130f 100644 --- a/.github/workflows/runtime.yml +++ b/.github/workflows/runtime.yml @@ -2,7 +2,7 @@ name: Runtime image on: push: - branches: [master, bench, 311-less-snapshots] + branches: [master, bench, 311-less-snapshots, update-pantry] jobs: push: From 187e8c6e011752ff168b852e102e2a6b0168e41e Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 14:46:25 +0530 Subject: [PATCH 3/9] Update base image --- .github/workflows/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 221bc85..6e126f5 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -2,7 +2,7 @@ name: Base image on: push: - branches: [base] + branches: [base, update-pantry] jobs: push: From 6d2db1bba457e264c14101ffb3b79ec1c6812511 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 15:32:40 +0530 Subject: [PATCH 4/9] Update stack.yaml --- stack.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index 2ae44a1..ef965b8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,10 +5,11 @@ extra-deps: - classy-prelude-yesod-1.5.0 - unliftio-core-0.1.2.0 - yesod-gitrepo-0.3.0 - -extra-deps: +- static-bytes-0.1.0 +- companion-0.1.0 +- aeson-warning-parser-0.1.0 - git: https://github.com/commercialhaskell/pantry.git - commit: 0b01e48c1856c5e8fe227495e075d324b7f0a613 + commit: ca136d1737a88773c4b0c8d28e73739f56e7b241 drop-packages: - Cabal From 26bf58966109eb6823e36fb1467a300e714ba881 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 15:41:35 +0530 Subject: [PATCH 5/9] Update commit --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index ef965b8..0c6668d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,7 +9,7 @@ extra-deps: - companion-0.1.0 - aeson-warning-parser-0.1.0 - git: https://github.com/commercialhaskell/pantry.git - commit: ca136d1737a88773c4b0c8d28e73739f56e7b241 + commit: 8e771ed7178d3b0948cba06f307455c2ca1b5e53 drop-packages: - Cabal From 02cdb54683a9c8feec125bbdc9aa36f9700dad17 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 11 Aug 2023 19:21:32 +0530 Subject: [PATCH 6/9] Update stack.yaml file --- stack.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 0c6668d..f53159f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,8 +8,12 @@ extra-deps: - static-bytes-0.1.0 - companion-0.1.0 - aeson-warning-parser-0.1.0 +- hpack-0.35.0 - git: https://github.com/commercialhaskell/pantry.git - commit: 8e771ed7178d3b0948cba06f307455c2ca1b5e53 + commit: 5df643cc1deb561d9c52a9cb6f593aba2bc4c08e drop-packages: - Cabal + +nix: + shell-file: shell.nix From 6e324aefe5f2cc7cbbf6009858e1a9f3a07a78dd Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Mon, 14 Aug 2023 11:53:40 +0530 Subject: [PATCH 7/9] Update docker tag --- docker/Dockerfile.runtime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.runtime b/docker/Dockerfile.runtime index 5662936..017f443 100644 --- a/docker/Dockerfile.runtime +++ b/docker/Dockerfile.runtime @@ -1,10 +1,10 @@ -FROM ghcr.io/fpco/stackage-server/base-build:37eb5f3da608d3796a5176a3c27fe83f340690e7 as build-app +FROM ghcr.io/fpco/stackage-server/base-build:02cdb54683a9c8feec125bbdc9aa36f9700dad17 as build-app RUN mkdir -p /artifacts/bin COPY . /src RUN stack install --stack-yaml /src/stack.yaml --local-bin-path /artifacts/bin -FROM ghcr.io/fpco/stackage-server/base-run:37eb5f3da608d3796a5176a3c27fe83f340690e7 +FROM ghcr.io/fpco/stackage-server/base-run:02cdb54683a9c8feec125bbdc9aa36f9700dad17 COPY --from=build-app /src/config/ /app/config/ COPY --from=build-app /src/static/ /app/static/ From 6822d1c1ef8e9ac1d675d23b02fdbff76f3cd93b Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Mon, 14 Aug 2023 11:53:49 +0530 Subject: [PATCH 8/9] Update workflow --- .github/workflows/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 6e126f5..221bc85 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -2,7 +2,7 @@ name: Base image on: push: - branches: [base, update-pantry] + branches: [base] jobs: push: From 2e1c651cefa67feba81487bf698eeee5cd6f815a Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Thu, 17 Aug 2023 10:10:26 +0530 Subject: [PATCH 9/9] Cleanup workflow and stack.yaml file --- .github/workflows/runtime.yml | 2 +- stack.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml index 91c130f..ddcd9b0 100644 --- a/.github/workflows/runtime.yml +++ b/.github/workflows/runtime.yml @@ -2,7 +2,7 @@ name: Runtime image on: push: - branches: [master, bench, 311-less-snapshots, update-pantry] + branches: [master] jobs: push: diff --git a/stack.yaml b/stack.yaml index f53159f..5449ef3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -14,6 +14,3 @@ extra-deps: drop-packages: - Cabal - -nix: - shell-file: shell.nix