Skip to content

Commit 22d387c

Browse files
Merge pull request #472 from rainlanguage/rename-prelude-command
Rename prelude build command to rainlang-prelude
2 parents c636657 + ac409df commit 22d387c

6 files changed

Lines changed: 14 additions & 29 deletions

File tree

.github/workflows/git-clean.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
name: Git is clean
22
on: [push]
3-
43
concurrency:
54
group: ${{ github.ref }}-git-clean
65
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
7-
86
jobs:
97
git-clean:
108
runs-on: ubuntu-latest
@@ -13,7 +11,6 @@ jobs:
1311
with:
1412
submodules: recursive
1513
fetch-depth: 0
16-
1714
- uses: nixbuild/nix-quick-install-action@v30
1815
with:
1916
nix_conf: |
@@ -30,15 +27,11 @@ jobs:
3027
# before trying to save a new cache
3128
# 1G = 1073741824
3229
gc-max-store-size-linux: 1G
33-
3430
# Build metas etc. required to do a correct pointer build.
35-
- run: nix develop -c i9r-prelude
36-
31+
- run: nix develop -c rainlang-prelude
3732
- run: nix develop -c forge script ./script/BuildPointers.sol
38-
3933
# Format the repo after generating pointers so that the pointer files are
4034
# formatted too.
4135
- run: nix develop -c forge fmt
42-
4336
# Check if the repo is clean after generating pointers and formatting.
4437
- run: git diff --exit-code

.github/workflows/manual-sol-artifacts.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- interpreter
1313
- expression-deployer
1414
- rainlang
15-
1615
jobs:
1716
deploy:
1817
runs-on: ubuntu-latest
@@ -21,7 +20,6 @@ jobs:
2120
with:
2221
submodules: recursive
2322
fetch-depth: 0
24-
2523
- uses: nixbuild/nix-quick-install-action@v30
2624
with:
2725
nix_conf: |
@@ -38,24 +36,21 @@ jobs:
3836
# before trying to save a new cache
3937
# 1G = 1073741824
4038
gc-max-store-size-linux: 1G
41-
4239
- run: nix develop --command rainix-sol-prelude
4340
- run: nix develop --command rainix-rs-prelude
44-
- run: nix develop --command i9r-prelude
41+
- run: nix develop --command rainlang-prelude
4542
- run: nix develop -c forge selectors up --all
4643
- run: nix develop -c forge script script/Deploy.sol:Deploy -vvvvv --slow --broadcast --verify
4744
env:
4845
DEPLOYMENT_KEY: ${{ github.ref == 'refs/heads/main' && secrets.PRIVATE_KEY || secrets.PRIVATE_KEY_DEV }}
4946
DEPLOYMENT_SUITE: ${{ inputs.suite }}
50-
5147
CI_DEPLOY_ARBITRUM_RPC_URL: ${{ secrets.CI_DEPLOY_ARBITRUM_RPC_URL || vars.CI_DEPLOY_ARBITRUM_RPC_URL || '' }}
5248
CI_DEPLOY_BASE_RPC_URL: ${{ secrets.CI_DEPLOY_BASE_RPC_URL || vars.CI_DEPLOY_BASE_RPC_URL || '' }}
5349
CI_DEPLOY_BASE_SEPOLIA_RPC_URL: ${{ secrets.CI_DEPLOY_BASE_SEPOLIA_RPC_URL || vars.CI_DEPLOY_BASE_SEPOLIA_RPC_URL || '' }}
5450
CI_DEPLOY_FLARE_RPC_URL: ${{ secrets.CI_DEPLOY_FLARE_RPC_URL || vars.CI_DEPLOY_FLARE_RPC_URL || '' }}
5551
CI_DEPLOY_POLYGON_RPC_URL: ${{ secrets.CI_DEPLOY_POLYGON_RPC_URL || vars.CI_DEPLOY_POLYGON_RPC_URL || '' }}
56-
5752
CI_DEPLOY_ARBITRUM_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_ARBITRUM_ETHERSCAN_API_KEY || vars.CI_DEPLOY_ARBITRUM_ETHERSCAN_API_KEY || '' }}
5853
CI_DEPLOY_BASE_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_BASE_ETHERSCAN_API_KEY || vars.CI_DEPLOY_BASE_ETHERSCAN_API_KEY || '' }}
5954
CI_DEPLOY_BASE_SEPOLIA_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_BASE_SEPOLIA_ETHERSCAN_API_KEY || vars.CI_DEPLOY_BASE_SEPOLIA_ETHERSCAN_API_KEY || '' }}
6055
CI_DEPLOY_FLARE_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_FLARE_ETHERSCAN_API_KEY || vars.CI_DEPLOY_FLARE_ETHERSCAN_API_KEY || '' }}
61-
CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY || vars.CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY || '' }}
56+
CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY: ${{ secrets.CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY || vars.CI_DEPLOY_POLYGON_ETHERSCAN_API_KEY || '' }}

.github/workflows/rainix.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
name: Rainix CI
22
on: [push]
3-
43
concurrency:
54
group: ${{ github.ref }}-rainix
65
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
7-
86
jobs:
97
rainix:
108
strategy:
@@ -32,7 +30,6 @@ jobs:
3230
with:
3331
submodules: recursive
3432
fetch-depth: 0
35-
3633
- uses: nixbuild/nix-quick-install-action@v30
3734
with:
3835
nix_conf: |
@@ -49,10 +46,9 @@ jobs:
4946
# before trying to save a new cache
5047
# 1G = 1073741824
5148
gc-max-store-size-linux: 1G
52-
5349
- run: nix develop -c rainix-sol-prelude
5450
- run: nix develop -c rainix-rs-prelude
55-
- run: nix develop -c i9r-prelude
51+
- run: nix develop -c rainlang-prelude
5652
- name: Run ${{ matrix.task }}
5753
env:
5854
ETH_RPC_URL: ${{ secrets.CI_DEPLOY_SEPOLIA_RPC_URL || vars.CI_DEPLOY_SEPOLIA_RPC_URL }}

CLAUDE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ the nix shell via direnv.
2020
```bash
2121
nix develop -c rainix-sol-prelude
2222
nix develop -c rainix-rs-prelude
23-
nix develop -c i9r-prelude
23+
nix develop -c rainlang-prelude
2424
```
2525

26-
`i9r-prelude` generates metadata files needed by the Solidity build (runs
26+
`rainlang-prelude` generates metadata files needed by the Solidity build (runs
2727
`BuildAuthoringMeta.sol`, then `rain meta build` to produce CBOR-encoded
2828
deflated meta).
2929

@@ -52,7 +52,7 @@ nix develop -c cargo doc # Rust docs
5252
### Build Pipeline
5353

5454
1. `BuildAuthoringMeta.sol` exports raw ABI-encoded authoring meta to `meta/`
55-
2. `i9r-prelude` runs `rain meta build` to CBOR-encode and deflate the meta
55+
2. `rainlang-prelude` runs `rain meta build` to CBOR-encode and deflate the meta
5656
3. `nix develop -c forge script --silent ./script/BuildPointers.sol` deploys
5757
contracts in local EVM, extracts function pointer tables, and writes
5858
`src/generated/*.pointers.sol`
@@ -65,7 +65,8 @@ The `src/generated/` directory contains build-time generated constants (bytecode
6565
hashes, function pointer tables, parse meta). These are regenerated by
6666
`BuildPointers.sol`.
6767

68-
After any source change affecting bytecode: run `nix develop -c i9r-prelude`
68+
After any source change affecting bytecode: run
69+
`nix develop -c rainlang-prelude`
6970
`nix develop -c forge script --silent ./script/BuildPointers.sol`
7071
`nix develop -c forge fmt`, then run `LibInterpreterDeployTest` to get new
7172
deploy addresses/codehashes. Update `LibInterpreterDeploy.sol` and repeat until

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
in
2222
rec {
2323
packages = rec {
24-
i9r-prelude = rainix.mkTask.${system} {
25-
name = "i9r-prelude";
24+
rainlang-prelude = rainix.mkTask.${system} {
25+
name = "rainlang-prelude";
2626
body = ''
2727
set -euxo pipefail
2828
@@ -66,7 +66,7 @@
6666
devShells.default = pkgs.mkShell {
6767
inherit (rainix.devShells.${system}.default) shellHook;
6868
packages = [
69-
packages.i9r-prelude
69+
packages.rainlang-prelude
7070
packages.test-wasm-build
7171
];
7272
inputsFrom = [ rainix.devShells.${system}.default ];

script/BuildAuthoringMeta.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import {LibRainlangReferenceExtern} from "../src/concrete/extern/RainlangReferen
88

99
/// @title BuildAuthoringMeta
1010
/// @notice Forge script that writes raw ABI-encoded AuthoringMeta bytes to
11-
/// disk for each parser. The output files are consumed by the `i9r-prelude`
11+
/// disk for each parser. The output files are consumed by the `rainlang-prelude`
1212
/// meta build pipeline which deflates and cbor-encodes them.
1313
contract BuildAuthoringMeta is Script {
1414
/// Writes raw ABI-encoded authoring meta bytes to disk for both the
1515
/// standard ops and the reference extern. The output files are consumed
16-
/// by the `i9r-prelude` meta build pipeline to produce the final
16+
/// by the `rainlang-prelude` meta build pipeline to produce the final
1717
/// deflated/cbor-encoded meta.
1818
function run() external {
1919
vm.writeFileBinary("meta/AuthoringMeta.rain.meta", LibAllStandardOps.authoringMetaV2());

0 commit comments

Comments
 (0)