Tidying and trimming out of date build configuration(s)

endgame · Apr 30, 2021 · 6194d08 · 6194d08
1 parent 8d34ef8
commit 6194d08
Show file tree

Hide file tree

Showing 174 changed files with 138 additions and 1,731 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+eval "$(lorri direnv)"
+
+PATH_add scripts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,18 +2,18 @@ name: build
 
 on:
   push:
-    branches: main
+    branches: bh/ci
   pull_request:
-    branches: main
+    branches: bh/ci
 
 jobs:
-  core:
+  build:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-latest, ghc: ghc8104 }
           - { os: ubuntu-latest, ghc: ghc884 }
+          - { os: ubuntu-latest, ghc: ghc8104 }
           - { os: macos-latest, ghc: ghc8104 }
 
     runs-on: ${{ matrix.os }}
@@ -26,25 +26,7 @@ jobs:
           name: amazonka
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-      - run: nix-build -A workflows.core --argstr ghcVersion ${{ matrix.ghc }}
-
-  libs:
-    needs:
-      - core
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { os: ubuntu-latest, ghc: ghc8104 }
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
-        with:
-          name: amazonka
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      - if: ${{ matrix.os != 'macos-latest' }}
+        run: sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt &
 
-      - run: nix-build -A workflows.libs --argstr ghcVersion ${{ matrix.ghc }}
+      - run: nix-build -A ci.library -A ci.checks --argstr ghcVersion ${{ matrix.ghc }}
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -24,14 +24,12 @@ automatically kept up to date with Amazon's latest service APIs.
 An introductory blog post detailing some of the motivation and design decisions
 can be found [here](http://brendanhay.nz/amazonka-comprehensive-haskell-aws-client).
 
+
 ## Documentation
 
 You can find the latest stable release documentation for each respective library
 on Hackage under the [AWS section](http://hackage.haskell.org/packages/#cat:AWS).
 
-Haddock documentation which is built by CI from the `develop` branch
-can be found [here](http://brendanhay.nz/amazonka-doc).
-
 
 ## Organisation
 
@@ -43,8 +41,7 @@ This repository is organised into the following directory structure:
 * [`core`](core): The `amazonka-core` library upon which each of the services depends.
 * [`examples`](examples): A currently sparse collection of examples for the various services.
 * [`gen`](gen): The code generation binary, along with configuration, templates, and assets.
-* [`script`](script): CI scripts to manage the release lifecycle of the service libraries.
-* [`share`](share): Makefile plumbing common to all service libraries
+* [`scripts`](scripts): CI scripts to manage the release lifecycle of the service libraries.
 * [`test`](test): The `amazonka-test` library containing common test functionality.
 
 
@@ -59,13 +56,10 @@ For any problems, comments, or feedback please create an issue [here on GitHub](
 
 ### Package Names
 
-It is often desirable to provide supplemental functionality to `amazonka` as
-an additional library, for example providing S3 encryption via a package such
+It is often desirable to provide supplemental functionality to `amazonka` as an additional library, for example providing S3 encryption via a package such
 as `amazonka-s3-encryption`.
 
-I ask that authors of these packages carefully consider package naming
-and preferably do not prefix the package with `amazonka-*` to avoid potential
-collisions with generated package names.
+Authors of these packages carefully consider package naming and preferably do not prefix the package with `amazonka-*` to avoid potential collisions with generated package names.
 
 
 ## Licence

diff --git a/amazonka-alexa-business/Makefile b/amazonka-alexa-business/Makefile
diff --git a/amazonka-apigateway/Makefile b/amazonka-apigateway/Makefile
diff --git a/amazonka-application-autoscaling/Makefile b/amazonka-application-autoscaling/Makefile
diff --git a/amazonka-appstream/Makefile b/amazonka-appstream/Makefile
diff --git a/amazonka-appsync/Makefile b/amazonka-appsync/Makefile
diff --git a/amazonka-athena/Makefile b/amazonka-athena/Makefile
diff --git a/amazonka-autoscaling-plans/Makefile b/amazonka-autoscaling-plans/Makefile
diff --git a/amazonka-autoscaling/Makefile b/amazonka-autoscaling/Makefile
diff --git a/amazonka-batch/Makefile b/amazonka-batch/Makefile
diff --git a/amazonka-budgets/Makefile b/amazonka-budgets/Makefile
diff --git a/amazonka-certificatemanager-pca/Makefile b/amazonka-certificatemanager-pca/Makefile
diff --git a/amazonka-certificatemanager/Makefile b/amazonka-certificatemanager/Makefile
diff --git a/amazonka-cloud9/Makefile b/amazonka-cloud9/Makefile
diff --git a/amazonka-clouddirectory/Makefile b/amazonka-clouddirectory/Makefile
diff --git a/amazonka-cloudformation/Makefile b/amazonka-cloudformation/Makefile
diff --git a/amazonka-cloudfront/Makefile b/amazonka-cloudfront/Makefile
diff --git a/amazonka-cloudhsm/Makefile b/amazonka-cloudhsm/Makefile
diff --git a/amazonka-cloudhsmv2/Makefile b/amazonka-cloudhsmv2/Makefile
diff --git a/amazonka-cloudsearch-domains/Makefile b/amazonka-cloudsearch-domains/Makefile
diff --git a/amazonka-cloudsearch/Makefile b/amazonka-cloudsearch/Makefile
diff --git a/amazonka-cloudtrail/Makefile b/amazonka-cloudtrail/Makefile
diff --git a/amazonka-cloudwatch-events/Makefile b/amazonka-cloudwatch-events/Makefile
diff --git a/amazonka-cloudwatch-logs/Makefile b/amazonka-cloudwatch-logs/Makefile
diff --git a/amazonka-cloudwatch/Makefile b/amazonka-cloudwatch/Makefile
diff --git a/amazonka-codebuild/Makefile b/amazonka-codebuild/Makefile
diff --git a/amazonka-codecommit/Makefile b/amazonka-codecommit/Makefile
diff --git a/amazonka-codedeploy/Makefile b/amazonka-codedeploy/Makefile
diff --git a/amazonka-codepipeline/Makefile b/amazonka-codepipeline/Makefile
diff --git a/amazonka-codestar/Makefile b/amazonka-codestar/Makefile
diff --git a/amazonka-cognito-identity/Makefile b/amazonka-cognito-identity/Makefile
diff --git a/amazonka-cognito-idp/Makefile b/amazonka-cognito-idp/Makefile
diff --git a/amazonka-cognito-sync/Makefile b/amazonka-cognito-sync/Makefile
diff --git a/amazonka-comprehend/Makefile b/amazonka-comprehend/Makefile
diff --git a/amazonka-config/Makefile b/amazonka-config/Makefile
diff --git a/amazonka-connect/Makefile b/amazonka-connect/Makefile
diff --git a/amazonka-cost-explorer/Makefile b/amazonka-cost-explorer/Makefile
diff --git a/amazonka-cur/Makefile b/amazonka-cur/Makefile
diff --git a/amazonka-datapipeline/Makefile b/amazonka-datapipeline/Makefile
diff --git a/amazonka-devicefarm/Makefile b/amazonka-devicefarm/Makefile
diff --git a/amazonka-directconnect/Makefile b/amazonka-directconnect/Makefile