Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
Browse files Browse the repository at this point in the history
…to effectfully/builtins/make-all-builtins-strict
  • Loading branch information
effectfully committed Nov 7, 2024
2 parents bc38cf0 + 2411c01 commit 3b689ae
Show file tree
Hide file tree
Showing 1,627 changed files with 12,616 additions and 9,012 deletions.
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/cabal-build-all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow runs `cabal build all` on both Linux and macOS with all supported GHC versions.
# Normally, if Nix can build the shell and the packages via haskell.nix, we can be confident that
# Cabal can build the project inside the Nix shell.
# However, this workflow is implemented to catch edge cases, such as the one described in
# https://github.com/IntersectMBO/plutus/issues/6625.

name: "👷 Cabal Build All"

on:
workflow_dispatch:
# push:
# branches:
# - master

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
ghc: [ghc810, ghc910, ghc96, ghc98] # Add GHC versions as needed
fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@main

- name: Cold Build On ${{ matrix.os }} & ${{ matrix.ghc }}
run: |
nix develop --no-warn-dirty --accept-flake-config .#${{ matrix.ghc }} \
--command bash -c 'cabal clean && cabal update && cabal build all'
2 changes: 1 addition & 1 deletion .github/workflows/cardano-constitution-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docusaurus-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
run:
name: Run
runs-on: [self-hosted, plutus-shared]
runs-on: [self-hosted, plutus-ci]
permissions:
contents: write
environment:
Expand All @@ -29,7 +29,7 @@ jobs:

- name: Deploy Site
if: github.event_name == 'push'
uses: JamesIves/[email protected].4
uses: JamesIves/[email protected].8
with:
folder: doc/docusaurus/build
target-folder: docs
Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/haddock-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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/[email protected].4
uses: JamesIves/[email protected].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/[email protected].4
uses: JamesIves/[email protected].8
with:
folder: _haddock
target-folder: haddock/latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/longitudinal-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: git config core.hooksPath no-hooks

- name: Deploy Results
uses: benchmark-action/[email protected].3
uses: benchmark-action/[email protected].4
with:
name: Plutus Benchmarks
tool: 'customSmallerIsBetter'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/metatheory-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -59,15 +59,15 @@ jobs:
cp -RL result/* _metatheory
- name: Deploy Site
uses: JamesIves/[email protected].4
uses: JamesIves/[email protected].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/[email protected].4
uses: JamesIves/[email protected].8
with:
folder: _metatheory
target-folder: metatheory/latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/papers-and-specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
done
- name: Publish Papers
uses: JamesIves/[email protected].4
uses: JamesIves/[email protected].8
with:
folder: _resources
target-folder: resources
Expand Down
Loading

0 comments on commit 3b689ae

Please sign in to comment.