Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/manual-rs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@ on:
- major # Increase the major version (x.0.0)
- release # Remove the pre-version, ie remove alpha/beta/rc (x.y.z)
- rc # Increase the rc pre-version (x.y.z-rc.M)

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

- uses: nixbuild/nix-quick-install-action@v30
with:
nix_conf: |
Expand All @@ -32,19 +29,13 @@ jobs:
- name: Restore and save Nix store
uses: nix-community/cache-nix-action@v6
with:
# restore and save a cache using this key
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
# if there's no cache hit, restore a cache by this prefix
restore-prefixes-first-match: nix-${{ runner.os }}-
gc-max-store-size-linux: 1G

- run: |
git config --global user.email "${{ secrets.CI_GIT_EMAIL }}"
git config --global user.name "${{ secrets.CI_GIT_USER }}"

- run: nix develop -c rainix-rs-prelude
- run: nix develop -c rainix-rs-test

- run: nix develop -c cargo release --no-confirm --execute ${{ inputs.version-level }}
- run: nix develop github:rainlanguage/rainix#rust-shell -c cargo test
- run: nix develop github:rainlanguage/rainix#rust-shell -c cargo release --no-confirm --execute ${{ inputs.version-level }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
5 changes: 5 additions & 0 deletions .github/workflows/rainix-rs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: rainix-rs
on: [push]
jobs:
rs:
uses: rainlanguage/rainix/.github/workflows/rainix-rs.yaml@main
40 changes: 0 additions & 40 deletions .github/workflows/rainix.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ target

# foundry
cache
out
out.pre-commit-config.yaml
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ getrandom_03 = { package = "getrandom", version = "0.3", features = [

[dev-dependencies]
serde = "1.0.203"
tokio = { version = "1.28.0", features = ["full"] }
serde_json = { version = "1.0.117", features = ["raw_value"] }
tokio = { version = "1.28.0", features = ["macros", "rt"] }

[lib]
path = "src/lib.rs"
Expand Down
131 changes: 103 additions & 28 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
description = "Flake for development workflows.";

inputs = {
rainix.url = "github:rainprotocol/rainix";
rainix.url = "github:rainlanguage/rainix";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, flake-utils, rainix }:
outputs =
{
flake-utils,
rainix,
...
}:
flake-utils.lib.eachDefaultSystem (system: {
packages = rainix.packages.${system};
devShells = rainix.devShells.${system};
devShells.default = rainix.devShells.${system}.rust-shell;
});
}
Loading