From bb4a210c33f74478784d02e3c4eee15e039ef31f Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Mon, 25 Sep 2023 10:38:30 -0400 Subject: [PATCH] Rev actions, stack.yamls --- .github/workflows/ci.yml | 14 +++-- stack-lts-20.26.yaml | 28 ++++++++++ stack-lts-20.26.yaml.lock | 109 ++++++++++++++++++++++++++++++++++++++ stack.yaml | 2 +- stack.yaml.lock | 8 +-- 5 files changed, 148 insertions(+), 13 deletions(-) create mode 100644 stack-lts-20.26.yaml create mode 100644 stack-lts-20.26.yaml.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6228d029..7c375fac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,27 +26,25 @@ jobs: strategy: matrix: stack-yaml: - - stack-nightly.yaml # ghc-9.4 - - stack.yaml # ghc-9.2 + - stack-nightly.yaml # ghc-9.6 + - stack.yaml # ghc-9.4 + - stack-lts-20.26.yaml # ghc-9.2 - stack-lts-19.33.yaml # ghc-9.0 - stack-lts-18.28.yaml # ghc-8.10 fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install rdkafka run: sudo apt-get install --assume-yes --no-install-recommends librdkafka-dev - - uses: freckle/stack-cache-action@v2 - with: - stack-yaml: ${{ matrix.stack-yaml }} - - uses: freckle/stack-action@v3 + - uses: freckle/stack-action@v4 with: stack-yaml: ${{ matrix.stack-yaml }} lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: haskell/actions/hlint-setup@v2 - uses: haskell/actions/hlint-run@v2 with: diff --git a/stack-lts-20.26.yaml b/stack-lts-20.26.yaml new file mode 100644 index 00000000..32311757 --- /dev/null +++ b/stack-lts-20.26.yaml @@ -0,0 +1,28 @@ +resolver: lts-20.20 +extra-deps: + - monad-validate-1.3.0.0 + - hs-opentelemetry-api-0.1.0.0 + - hs-opentelemetry-instrumentation-persistent-0.1.0.0 + - hs-opentelemetry-instrumentation-wai-0.1.0.0 + - hs-opentelemetry-sdk-0.0.3.6 + - resource-pool-0.4.0.0 + + # for hs-opentelemetry-sdk + - hs-opentelemetry-exporter-otlp-0.0.1.5 + - hs-opentelemetry-propagator-b3-0.0.1.1 + - hs-opentelemetry-propagator-w3c-0.0.1.3 + + # for hs-opentelemetry-exporter-otlp + - hs-opentelemetry-otlp-0.0.1.0 + + # for hs-opentelemetry-api + - thread-utils-context-0.3.0.4 + + # for thread-utils-context + - thread-utils-finalizers-0.1.1.0 + + # See https://github.com/iand675/hs-opentelemetry/issues/98 + - github: iand675/hs-opentelemetry + commit: 8fcdc7323cf872abfcc02ff512429b2a3d617085 + subdirs: + - propagators/datadog diff --git a/stack-lts-20.26.yaml.lock b/stack-lts-20.26.yaml.lock new file mode 100644 index 00000000..ebf7ea0e --- /dev/null +++ b/stack-lts-20.26.yaml.lock @@ -0,0 +1,109 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605 + pantry-tree: + sha256: 0b2a3a57be48fcc739708b214fca202f1e95b1cd773dd3bb9589d3007cf8cf5e + size: 611 + original: + hackage: monad-validate-1.3.0.0 +- completed: + hackage: hs-opentelemetry-api-0.1.0.0@sha256:8af01d0c81dd1af6d3293b105178fd9bfa0057c9eb88ac24d3c440bff660abe3,3705 + pantry-tree: + sha256: 7c332e7241636097fe199bd87f57db333830bed416296e7ebf944497557f46be + size: 3221 + original: + hackage: hs-opentelemetry-api-0.1.0.0 +- completed: + hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0@sha256:920e078b1bc141527a10c547e887ddb8d6295b216c49c8d1fe94f243d832eff9,1824 + pantry-tree: + sha256: 27f0fef99e1c6b58d7fa4a5a3119df612c7ac0687723dbd5cc200747c9fe1829 + size: 426 + original: + hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0 +- completed: + hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0@sha256:6019cf031b3edec6ff0ace0df4c2e41358b9e5d939e6c326e4e1df50726348ee,1852 + pantry-tree: + sha256: affe8d2c4c55181c84fc74abef68fde5c11a99581fd29a97e6a8a9fd1e016a43 + size: 411 + original: + hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0 +- completed: + hackage: hs-opentelemetry-sdk-0.0.3.6@sha256:6776705a4e0c06c6a4bfa16a9bed3ba353901f52d214ac737f57ea7f8e1ed465,3746 + pantry-tree: + sha256: 154663d933a44c350db6c98d2c14db192c14fd04a10c17d0ebb8090707bd359b + size: 1430 + original: + hackage: hs-opentelemetry-sdk-0.0.3.6 +- completed: + hackage: resource-pool-0.4.0.0@sha256:9c1e448a159875e21a7e68697feee2b61a4e584720974fa465a2fa1bc0776c73,1342 + pantry-tree: + sha256: 1008fbb9b6bd9d12925989f2708af612daa3a8ebf3a56763016231461d9e314f + size: 406 + original: + hackage: resource-pool-0.4.0.0 +- completed: + hackage: hs-opentelemetry-exporter-otlp-0.0.1.5@sha256:89b0a6481096a338fa6383fbdf08ccaa0eb7bb009c4cbb340894eac33e55c5de,2214 + pantry-tree: + sha256: 744146043f5818ad2b7577a32862affcbf6ed400b097723eae9f6941d739365e + size: 400 + original: + hackage: hs-opentelemetry-exporter-otlp-0.0.1.5 +- completed: + hackage: hs-opentelemetry-propagator-b3-0.0.1.1@sha256:f0e9da77a888b89f81e5f5186788d5ace2a665e8914f6b446712a1c2edf17743,1854 + pantry-tree: + sha256: 7ed0b0433837946d86f2ab364ef284dfc17fdcef9b4ea5fc48577a9441deeade + size: 482 + original: + hackage: hs-opentelemetry-propagator-b3-0.0.1.1 +- completed: + hackage: hs-opentelemetry-propagator-w3c-0.0.1.3@sha256:5dc2dbdd6b0a4e434ca5fd949e9ebe5611a5d513ef58009b935e9e810cc85d1b,1852 + pantry-tree: + sha256: 84a8e40facf8df13084682a6e4852d940acc9d9abeaf2d716dbc9415258f4cc5 + size: 496 + original: + hackage: hs-opentelemetry-propagator-w3c-0.0.1.3 +- completed: + hackage: hs-opentelemetry-otlp-0.0.1.0@sha256:88bb6b68f172a336f78018b0823f47363fb7408eb19f7301489f81ad4d5c0f33,2307 + pantry-tree: + sha256: e56292fc693805babed3c7ba7fc54e59d2e9adbc38de6bcc659009e8b10b9a1b + size: 2252 + original: + hackage: hs-opentelemetry-otlp-0.0.1.0 +- completed: + hackage: thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 + pantry-tree: + sha256: 57d909a991b5e0b4c7a28121cb52ee9c2db6c09e0419b89af6c82fae52be88d4 + size: 397 + original: + hackage: thread-utils-context-0.3.0.4 +- completed: + hackage: thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 + pantry-tree: + sha256: 8c2c2e2e22c20bf3696ee6f30b50b3a9eeae187a22beb536441eefb0a3f9c549 + size: 400 + original: + hackage: thread-utils-finalizers-0.1.1.0 +- completed: + name: hs-opentelemetry-propagator-datadog + pantry-tree: + sha256: cab894439e1bbb20a9ef901c3ac14b519ccd74e2712789472564bccdaa67da78 + size: 683 + sha256: 53a6cd3a01447c9a41512de16c44a7f6ba3fde3fab61b765fcd22b6ac33a882e + size: 352144 + subdir: propagators/datadog + url: https://github.com/iand675/hs-opentelemetry/archive/8fcdc7323cf872abfcc02ff512429b2a3d617085.tar.gz + version: 0.0.0.0 + original: + subdir: propagators/datadog + url: https://github.com/iand675/hs-opentelemetry/archive/8fcdc7323cf872abfcc02ff512429b2a3d617085.tar.gz +snapshots: +- completed: + sha256: 126fa33ceb11f5e85ceb4e86d434756bd9a8439e2e5776d306a15fbc63b01e89 + size: 650041 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/20.yaml + original: lts-20.20 diff --git a/stack.yaml b/stack.yaml index b6567e33..e34e69ce 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.20 +resolver: lts-21.13 extra-deps: - monad-validate-1.3.0.0 - hs-opentelemetry-api-0.1.0.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index bd0af2c1..7a592bc4 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -96,7 +96,7 @@ packages: url: https://github.com/iand675/hs-opentelemetry/archive/8fcdc7323cf872abfcc02ff512429b2a3d617085.tar.gz snapshots: - completed: - sha256: 126fa33ceb11f5e85ceb4e86d434756bd9a8439e2e5776d306a15fbc63b01e89 - size: 650041 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/20.yaml - original: lts-20.20 + sha256: 8017c7970c2a8a9510c60cc70ac245d59e0c34eb932b91d37af09fe59855d854 + size: 640038 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/13.yaml + original: lts-21.13