move Blammo into a subdirectory (#46)

freckle · Jul 19, 2024 · d72bd97 · d72bd97
1 parent b2e52ec
commit d72bd97
Show file tree

Hide file tree

Showing 41 changed files with 36 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,4 +38,4 @@ jobs:
       - uses: haskell-actions/hlint-run@v2
         with:
           fail-on: warning
-          path: '["src/", "tests/"]'
+          path: '["Blammo/src/", "Blammo/tests/"]'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,15 +7,27 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        package:
+          - Blammo
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - id: tag
         uses: freckle/haskell-tag-action@v1
+        with:
+          package-yaml: ${{ matrix.package }}/package.yaml
+          tag-prefix: ${{ matrix.package }}-v
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - if: steps.tag.outputs.tag
-        uses: freckle/stack-upload-action@v2
+        run: stack upload --pvp-bounds lower
+        with:
+          working-directory: ${{ matrix.package }}
         env:
-          HACKAGE_API_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }}
+          HACKAGE_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }}
+          STACK_YAML: ../stack-lts-14.27.yaml
diff --git a/Blammo.cabal → Blammo/Blammo.cabal b/Blammo.cabal → Blammo/Blammo.cabal
diff --git a/CHANGELOG.md → Blammo/CHANGELOG.md b/CHANGELOG.md → Blammo/CHANGELOG.md
diff --git a/LICENSE → Blammo/LICENSE b/LICENSE → Blammo/LICENSE
diff --git a/README.lhs → Blammo/README.lhs b/README.lhs → Blammo/README.lhs
diff --git a/README.md → Blammo/README.md b/README.md → Blammo/README.md
diff --git a/files/blammo.png → Blammo/files/blammo.png b/files/blammo.png → Blammo/files/blammo.png
diff --git a/files/example-wide.hs → Blammo/files/example-wide.hs b/files/example-wide.hs → Blammo/files/example-wide.hs
diff --git a/files/example.hs → Blammo/files/example.hs b/files/example.hs → Blammo/files/example.hs
diff --git a/files/multiline.png → Blammo/files/multiline.png b/files/multiline.png → Blammo/files/multiline.png
diff --git a/files/readme-json.png → Blammo/files/readme-json.png b/files/readme-json.png → Blammo/files/readme-json.png
diff --git a/files/readme-terminal-debug.png → Blammo/files/readme-terminal-debug.png b/files/readme-terminal-debug.png → Blammo/files/readme-terminal-debug.png
diff --git a/files/readme-terminal.png → Blammo/files/readme-terminal.png b/files/readme-terminal.png → Blammo/files/readme-terminal.png
diff --git a/package.yaml → Blammo/package.yaml b/package.yaml → Blammo/package.yaml
diff --git a/src/Blammo/Logging.hs → Blammo/src/Blammo/Logging.hs b/src/Blammo/Logging.hs → Blammo/src/Blammo/Logging.hs
diff --git a/src/Blammo/Logging/Colors.hs → Blammo/src/Blammo/Logging/Colors.hs b/src/Blammo/Logging/Colors.hs → Blammo/src/Blammo/Logging/Colors.hs
diff --git a/src/Blammo/Logging/Internal/Logger.hs → Blammo/src/Blammo/Logging/Internal/Logger.hs b/src/Blammo/Logging/Internal/Logger.hs → Blammo/src/Blammo/Logging/Internal/Logger.hs
diff --git a/src/Blammo/Logging/LogSettings.hs → Blammo/src/Blammo/Logging/LogSettings.hs b/src/Blammo/Logging/LogSettings.hs → Blammo/src/Blammo/Logging/LogSettings.hs
diff --git a/src/Blammo/Logging/LogSettings/Env.hs → Blammo/src/Blammo/Logging/LogSettings/Env.hs b/src/Blammo/Logging/LogSettings/Env.hs → Blammo/src/Blammo/Logging/LogSettings/Env.hs
diff --git a/src/Blammo/Logging/LogSettings/LogLevels.hs → ...c/Blammo/Logging/LogSettings/LogLevels.hs b/src/Blammo/Logging/LogSettings/LogLevels.hs → ...c/Blammo/Logging/LogSettings/LogLevels.hs
diff --git a/src/Blammo/Logging/Logger.hs → Blammo/src/Blammo/Logging/Logger.hs b/src/Blammo/Logging/Logger.hs → Blammo/src/Blammo/Logging/Logger.hs
diff --git a/src/Blammo/Logging/Simple.hs → Blammo/src/Blammo/Logging/Simple.hs b/src/Blammo/Logging/Simple.hs → Blammo/src/Blammo/Logging/Simple.hs
diff --git a/src/Blammo/Logging/Terminal.hs → Blammo/src/Blammo/Logging/Terminal.hs b/src/Blammo/Logging/Terminal.hs → Blammo/src/Blammo/Logging/Terminal.hs
diff --git a/src/Blammo/Logging/Terminal/LogPiece.hs → ...o/src/Blammo/Logging/Terminal/LogPiece.hs b/src/Blammo/Logging/Terminal/LogPiece.hs → ...o/src/Blammo/Logging/Terminal/LogPiece.hs
diff --git a/src/Blammo/Logging/Test.hs → Blammo/src/Blammo/Logging/Test.hs b/src/Blammo/Logging/Test.hs → Blammo/src/Blammo/Logging/Test.hs
@@ -33,6 +33,7 @@ appendLogStr (LoggedMessages ref) str =
 appendLogStrLn :: MonadIO m => LoggedMessages -> LogStr -> m ()
 appendLogStrLn lm = appendLogStr lm . (<> "\n")
 
-getLoggedMessages :: MonadIO m => LoggedMessages -> m [Either String LoggedMessage]
+getLoggedMessages
+  :: MonadIO m => LoggedMessages -> m [Either String LoggedMessage]
 getLoggedMessages (LoggedMessages ref) =
   map (eitherDecodeStrict . fromLogStr) . DList.toList <$> readIORef ref
diff --git a/src/Blammo/Logging/WithLogger.hs → Blammo/src/Blammo/Logging/WithLogger.hs b/src/Blammo/Logging/WithLogger.hs → Blammo/src/Blammo/Logging/WithLogger.hs
diff --git a/src/Data/Aeson/Compat.hs → Blammo/src/Data/Aeson/Compat.hs b/src/Data/Aeson/Compat.hs → Blammo/src/Data/Aeson/Compat.hs
diff --git a/src/Network/Wai/Middleware/Logging.hs → Blammo/src/Network/Wai/Middleware/Logging.hs b/src/Network/Wai/Middleware/Logging.hs → Blammo/src/Network/Wai/Middleware/Logging.hs
diff --git a/src/System/Log/FastLogger/Compat.hs → Blammo/src/System/Log/FastLogger/Compat.hs b/src/System/Log/FastLogger/Compat.hs → Blammo/src/System/Log/FastLogger/Compat.hs
diff --git a/tests/Blammo/Logging/LogSettings/EnvSpec.hs → ...sts/Blammo/Logging/LogSettings/EnvSpec.hs b/tests/Blammo/Logging/LogSettings/EnvSpec.hs → ...sts/Blammo/Logging/LogSettings/EnvSpec.hs
diff --git a/...ammo/Logging/LogSettings/LogLevelsSpec.hs → ...ammo/Logging/LogSettings/LogLevelsSpec.hs b/...ammo/Logging/LogSettings/LogLevelsSpec.hs → ...ammo/Logging/LogSettings/LogLevelsSpec.hs
diff --git a/tests/Blammo/Logging/LoggerSpec.hs → Blammo/tests/Blammo/Logging/LoggerSpec.hs b/tests/Blammo/Logging/LoggerSpec.hs → Blammo/tests/Blammo/Logging/LoggerSpec.hs
diff --git a/tests/Blammo/Logging/TerminalSpec.hs → Blammo/tests/Blammo/Logging/TerminalSpec.hs b/tests/Blammo/Logging/TerminalSpec.hs → Blammo/tests/Blammo/Logging/TerminalSpec.hs
diff --git a/tests/Spec.hs → Blammo/tests/Spec.hs b/tests/Spec.hs → Blammo/tests/Spec.hs
diff --git a/stack-lts-14.27.yaml b/stack-lts-14.27.yaml
@@ -13,3 +13,6 @@ extra-deps:
   - hspec-discover-2.7.9
   - primitive-0.7.4.0
   - these-1.1
+
+packages:
+  - Blammo
diff --git a/stack-lts-16.31.yaml b/stack-lts-16.31.yaml
@@ -6,3 +6,6 @@ extra-deps:
   - monad-logger-0.3.39
   - monad-logger-aeson-0.4.0.3
   - context-0.2.0.0
+
+packages:
+  - Blammo
diff --git a/stack-lts-18.28.yaml b/stack-lts-18.28.yaml
@@ -4,3 +4,6 @@ extra-deps:
   - monad-logger-0.3.39
   - monad-logger-aeson-0.4.0.3
   - context-0.2.0.0
+
+packages:
+  - Blammo
diff --git a/stack-lts-19.33.yaml b/stack-lts-19.33.yaml
@@ -4,3 +4,6 @@ extra-deps:
   - monad-logger-0.3.39
   - monad-logger-aeson-0.4.0.3
   - context-0.2.0.1
+
+packages:
+  - Blammo
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -5,3 +5,6 @@ extra-deps:
 allow-newer: true
 allow-newer-deps:
   - monad-logger-aeson
+
+packages:
+  - Blammo
diff --git a/stack.yaml b/stack.yaml
@@ -6,3 +6,6 @@ extra-deps:
 allow-newer: true
 allow-newer-deps:
   - monad-logger-aeson
+
+packages:
+  - Blammo