Skip to content

Add GitHub action #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 21, 2022
Merged

Add GitHub action #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aafef47
Add GitHub action
paulyoung Mar 20, 2022
37d7fc9
Try running on macos to work around hash mismatch
paulyoung Mar 20, 2022
54f9f5e
Update the SHA since it seems to work locally
paulyoung Mar 20, 2022
226fcff
Add build matrix
paulyoung Mar 20, 2022
5d598c8
Change the order of the operating systems
paulyoung Mar 20, 2022
b04042b
Try only building on macOS for now
paulyoung Mar 20, 2022
5061562
Fix rustChannelOf usage
paulyoung Mar 20, 2022
cd23362
Add ubuntu back to build matrix
paulyoung Mar 20, 2022
87acdad
Use nixpkgs-mozilla flake
paulyoung Mar 21, 2022
ebde4e1
Add --show-trace to nix build
paulyoung Mar 21, 2022
0efc3b2
Add ref to fix issue with fetchGit assuming master
paulyoung Mar 21, 2022
47864ac
Revert "Add ref to fix issue with fetchGit assuming master"
paulyoung Mar 21, 2022
73db90a
Use a fork of naersk no address fetchGit issue
paulyoung Mar 21, 2022
6b06f17
Add rev in attempt to address CI failure
paulyoung Mar 21, 2022
7a95bc0
Remove ubuntu from the build matrix for now
paulyoung Mar 21, 2022
89c48cf
Add ubuntu back to matrix, remove nix flake check
paulyoung Mar 21, 2022
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
15 changes: 15 additions & 0 deletions .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Nix"
on:
pull_request:
push:
jobs:
nix:
name: Nix on ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@v15
- run: nix build --show-trace
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion examples/fat/src/fat/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ path = "lib.rs"
crate-type = ["cdylib"]

[dependencies]
fatfs = { git = "https://github.com/rafalh/rust-fatfs" }
fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e0344fcdde77359ef9e75432" }
fscommon = "0.1"
ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
ic-cdk-macros = "0.3"
Expand Down
46 changes: 23 additions & 23 deletions flake.lock
View file
Open in desktop

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

20 changes: 10 additions & 10 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@
flake = false;
};
flake-utils.url = "github:numtide/flake-utils";
mozillapkgs = {
url = "github:mozilla/nixpkgs-mozilla";
flake = false;
};
naersk.url = "github:nix-community/naersk";

# https://github.com/nix-community/naersk/pull/211
naersk.url = "github:mhuesch/naersk?rev=193e049d6e4c841faf800e302551d2e0a48eee88";
# naersk.url = "github:nix-community/naersk";

nixpkgs.url = "github:nixos/nixpkgs/21.11";
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
};

outputs = {
self,
nixpkgs,
dfinity-sdk,
flake-utils,
mozillapkgs,
naersk,
nixpkgs-mozilla,
}:
flake-utils.lib.eachDefaultSystem (
system: let
Expand All @@ -31,11 +32,10 @@
};

# Get a specific rust version
mozilla = pkgs.callPackage (mozillapkgs + "/package-set.nix") {};
mozilla = pkgs.callPackage (nixpkgs-mozilla + "/package-set.nix") {};
rust = (mozilla.rustChannelOf {
channel = "stable";
version = "1.54.0";
sha256 = "NL+YHnOj1++1O7CAaQLijwAxKJW9SnHg8qsiOJ1m0Kk=";
channel = "1.55.0";
sha256 = "HNIlEerJvk6sBfd8zugzwSgSiHcQH8ZbqWQn9BGfmpo=";
# sha256 = pkgs.lib.fakeSha256;
}).rust.override {
extensions = [
Expand Down