Merge branch 'master' of https://github.com/input-output-hk/plutus in…

…to effectfully/builtins/add-dropList

.editorconfig

@@ -1,7 +1,8 @@
 root = true
 
-[*]
-indent_style = space
+# TODO decide if we want this
+# [*]
+# indent_style = space
 
 [*.{nix, hs, lagda, agda}]
 charset = utf-8

.gitattributes

@@ -1,6 +1,5 @@
 # linguist gets confused by PIR files, and thinks they make up a lot of our source!
 *.pir linguist-detectable=false
-stubs/plutus-ghc-stub/** linguist-vendored=true
 # Large HTML files inside 'notes' are dominating our repoistory language
 # estimate.
 notes/**/*.html linguist-documentation

.github/workflows/broken-links.yml

@@ -4,14 +4,15 @@ name: "🔗 Broken Links"
 
 on:
   workflow_dispatch: # Or manually dispatch the job
+  pull_request:
   push:
     branches:
       master
 
 jobs:
   check:
     name: Check
-    runs-on: [plutus-shared, self-hosted]
+    runs-on: [plutus-ci, self-hosted]
     steps:
       - name: Checkout
         uses: actions/checkout@main

.github/workflows/cardano-constitution-tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   run:
     name: Run
-    runs-on: [self-hosted, plutus-shared]
+    runs-on: [self-hosted, plutus-ci]
     steps:
       - name: Checkout
         uses: actions/checkout@main

.github/workflows/docusaurus-site.yml

@@ -1,4 +1,5 @@
-# This workflow builds and publishes the Docusaurus site to:
+# This workflow builds the Docusaurus site on pull_request.
+# It also publishes the site on push to master to:
 # https://plutus.cardano.intersectmbo.org/docs
 
 name: "🦕 Docusaurus Site" 
@@ -8,11 +9,12 @@ on:
     branches: 
       - master 
   workflow_dispatch:
+  pull_request:
 
 jobs:
-  deploy:
-    name: Deploy 
-    runs-on: [self-hosted, plutus-shared]
+  run:
+    name: Run 
+    runs-on: [self-hosted, plutus-ci]
     permissions:
       contents: write
     environment:
@@ -26,8 +28,9 @@ jobs:
         run: nix develop --no-warn-dirty --accept-flake-config --command bash -c 'yarn && yarn build'
 
       - name: Deploy Site 
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        if: github.event_name == 'push'
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: doc/docusaurus/build
           target-folder: docs
-          single-commit: true
+          single-commit: true

.github/workflows/haddock-site.yml

@@ -16,15 +16,15 @@ on:
     inputs:
       ref:
         description: |
-          The $ref to build off of, e.g. "1.29.0.0", "master", or any other valid git ref.
+          The ref to build off of, e.g. "1.29.0.0", "master", or any other valid git ref.
           When making a release, this is usually the version tag, e.g. "1.29.0.0", and will be
           equal to the $destination input below. When back-porting this could be a commit sha instead.
         required: true
         type: string
 
       destination:
         description: |
-          The $destination folder, e.g. when "1.29.0.0" the haddock site will be deployed to:
+          The destination folder, e.g. when "1.29.0.0" the haddock site will be deployed to:
           https://plutus.cardano.intersectmbo.org/haddock/1.29.0.0
         required: true
         type: string
@@ -33,15 +33,24 @@ on:
         description: |
           If true, then the haddock site will also be deployed to:
           https://plutus.cardano.intersectmbo.org/haddock/latest.
-          You want to leave this to true unless you are deploying old versions or back-porting.
+          You want to check this when you are making a release.
+          You want to uncheck this when you are deploying old versions or back-porting.
         type: boolean
         required: true 
         default: true
 
+      script_ref: 
+          description: |
+            What branch to fetch the combined-haddock.sh script from.
+            Leave this to 'master' unless you are testing a new version of the script.
+          type: string
+          required: true 
+          default: 'master'
+
 jobs:
   deploy:
     name: Deploy
-    runs-on: [self-hosted, plutus-shared]
+    runs-on: [self-hosted, plutus-ci]
     permissions:
       contents: write
     environment:
@@ -54,23 +63,23 @@ jobs:
 
       - name: Checkout Haddock Script
         run: | 
-          git fetch origin master
-          git checkout origin/master ./scripts/combined-haddock.sh
+          git fetch origin ${{ inputs.script_ref || github.ref_name }}
+          git checkout origin/${{ inputs.script_ref || github.ref_name }} ./scripts/combined-haddock.sh
             
       - name: Build Site
         run: | 
           nix develop --no-warn-dirty --accept-flake-config --command ./scripts/combined-haddock.sh _haddock all
 
       - name: Deploy Site
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: _haddock
           target-folder: haddock/${{ inputs.destination || github.ref_name }}
           single-commit: true
 
       - name: Deploy Site (latest)
         if: ${{ inputs.latest == true }}
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: _haddock
           target-folder: haddock/latest

.github/workflows/longitudinal-benchmark.yml

@@ -40,7 +40,7 @@ jobs:
         run: git config core.hooksPath no-hooks
 
       - name: Deploy Results
-        uses: benchmark-action/github-action-benchmark@v1.20.3
+        uses: benchmark-action/github-action-benchmark@v1.20.4
         with:
           name: Plutus Benchmarks
           tool: 'customSmallerIsBetter'

.github/workflows/metatheory-site.yml

@@ -41,7 +41,7 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: [self-hosted, plutus-shared]
+    runs-on: [self-hosted, plutus-ci]
     permissions:
       contents: write
     environment:
@@ -59,15 +59,15 @@ jobs:
           cp -RL result/* _metatheory
 
       - name: Deploy Site
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: _metatheory
           target-folder: metatheory/${{ inputs.destination || github.ref_name }}
           single-commit: true
 
       - name: Deploy Site (latest)
         if: ${{ inputs.latest == true }}
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: _metatheory
           target-folder: metatheory/latest

.github/workflows/nightly-testsuite.yml

@@ -19,7 +19,7 @@ env:
 jobs:
   run:
     name: Run
-    runs-on: [self-hosted, plutus-shared]
+    runs-on: [self-hosted, plutus-ci]
     steps:
       - name: Checkout
         uses: actions/checkout@main

.github/workflows/papers-and-specs.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: [self-hosted, plutus-shared]
+    runs-on: [self-hosted, plutus-ci]
     permissions:
       contents: write
     environment:
@@ -40,7 +40,7 @@ jobs:
           done 
 
       - name: Publish Papers
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.8
         with:
           folder: _resources
           target-folder: resources

.github/workflows/plutus-tx-template.yml

@@ -1,7 +1,7 @@
-# This workflows ensures that the plutus-tx-template repository stays working 
-# even if there are changes in plutus. It checks out both the current commit of 
-# plutus and the master branch of plutus-tx-template. Then, it creates a 
-# cabal.project.local for plutus-tx-template that adjusts the plutus version. 
+# This workflows ensures that the plutus-tx-template repository stays working
+# even if there are changes in plutus. It checks out both the current commit of
+# plutus and the master branch of plutus-tx-template. Then, it creates a
+# cabal.project.local for plutus-tx-template that adjusts the plutus version.
 # Finally, it double-checks that everything still builds correctly using cabal
 # inside the devx shell.
 
@@ -17,40 +17,40 @@ jobs:
     steps:
       - name: Checkout plutus-tx-template Repo
         uses: actions/checkout@main
-        with: 
+        with:
           repository: IntersectMBO/plutus-tx-template
-          path: plutus-tx-template 
+          path: plutus-tx-template
 
       - name: Checkout plutus Repo
         uses: actions/checkout@main
-        with: 
+        with:
           path: plutus-tx-template/plutus
-  
+
       - name: Overwrite cabal.project.local
         uses: DamianReeves/write-file-action@master
         with:
           path: plutus-tx-template/cabal.project.local
           write-mode: overwrite
           contents: |
-            packages: 
+            packages:
               plutus/plutus-tx
               plutus/plutus-tx-plugin
               plutus/plutus-core
               plutus/plutus-ledger-api
               plutus/prettyprinter-configurable
-            
+
             allow-newer:
                 plutus-tx
               , plutus-tx-plugin
               , plutus-core
-              , plutus-ledger-api 
+              , plutus-ledger-api
               , prettyprinter-configurable
-          
+
       - name: Build Project With Docker
         run: |
-          cd plutus-tx-template 
+          cd plutus-tx-template
           docker run \
             -v ./.:/workspaces/plutus-tx-template \
             -w /workspaces/plutus-tx-template \
             -i ghcr.io/input-output-hk/devx-devcontainer:x86_64-linux.ghc96-iog \
-            bash -ic "cabal update && cabal run plutus-tx-template && test -e validator.uplc"
+            bash -ic "cabal update && cabal build all"