Skip to content

Commit

Permalink
nixfmt, enable other workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton-4 committed Sep 26, 2023
1 parent 1f862be commit 948e672
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic_cli_build_release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
##pull_request:
#pull_request:
workflow_dispatch:

# this cancels workflows currently in progress if you start a new one
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Benchmarks

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devtools_test_linux_x86_64.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Test the devtools nix files

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_x86_64.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Macos x86-64 rust tests

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown_link_check.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:
schedule:
- cron: '0 9 * * *' # 9=9am utc+0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix_linux_x86_64.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Nix linux x86_64 cargo test

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix_macos_apple_silicon.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Nix apple silicon cargo test

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix_macos_x86_64.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: Nix macOS x86_64 cargo test

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: SpellCheck

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_x86_64.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: CI

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_release_build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: windows - release build

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on:
#pull_request:
pull_request:

name: windows - subset of tests

Expand Down
60 changes: 33 additions & 27 deletions devtools/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,47 @@
let
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
flake-utils = roc.inputs.flake-utils;
in flake-utils.lib.eachSystem supportedSystems (system:
in
flake-utils.lib.eachSystem supportedSystems (system:
let
pkgs = import roc.inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};

isAarch64Darwin = pkgs.stdenv.hostPlatform.system == "aarch64-darwin";

rocShell = roc.devShell.${system};
in {
in
{
devShell = pkgs.mkShell {
packages = let
devInputs = with pkgs;
[ less bashInteractive ]
++ (if isAarch64Darwin then [] else [ gdb ]);

vscodeWithExtensions = pkgs.vscode-with-extensions.override {
vscodeExtensions = with pkgs.vscode-extensions;
[
matklad.rust-analyzer
# eamodio.gitlens
bbenoist.nix
tamasfe.even-better-toml
] ++ (if isAarch64Darwin then [] else [ vadimcn.vscode-lldb ])
packages =
let
devInputs = with pkgs;
[ less bashInteractive ]
++ (if isAarch64Darwin then [ ] else [ gdb ]);

vscodeWithExtensions = pkgs.vscode-with-extensions.override {
vscodeExtensions = with pkgs.vscode-extensions;
[
matklad.rust-analyzer
# eamodio.gitlens
bbenoist.nix
tamasfe.even-better-toml
] ++ (if isAarch64Darwin then [ ] else [ vadimcn.vscode-lldb ])
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "roc-lang-support";
publisher = "benjamin-thomas";
version = "0.0.4";
# keep this sha for the first run, nix will tell you the correct one to change it to
sha256 = "sha256-USZiXdvYa8hxj62cy6hdiS5c2tIDIQxSyux684lyAEY=";
}
]
;
};
in [ vscodeWithExtensions devInputs ];
{
name = "roc-lang-support";
publisher = "benjamin-thomas";
version = "0.0.4";
# keep this sha for the first run, nix will tell you the correct one to change it to
sha256 = "sha256-USZiXdvYa8hxj62cy6hdiS5c2tIDIQxSyux684lyAEY=";
}
]
;
};
in
[ vscodeWithExtensions devInputs ];

inputsFrom = [ rocShell ];

Expand All @@ -56,6 +60,8 @@

# to set the LLVM_SYS_<VERSION>_PREFIX
shellHook = rocShell.shellHook;

formatter = pkgs.nixpkgs-fmt;
};
});
}

0 comments on commit 948e672

Please sign in to comment.