Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-platform
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Théophile Choutri
horizon-platform
Commits
73857b7b
Commit
73857b7b
authored
2 years ago
by
Daniel Firth
Committed by
Daniel Firth
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update lint-utils
parent
58000f42
Branches
Branches containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+7
-6
7 additions, 6 deletions
.gitlab-ci.yml
flake.lock
+4
-4
4 additions, 4 deletions
flake.lock
flake.nix
+6
-4
6 additions, 4 deletions
flake.nix
with
17 additions
and
14 deletions
.gitlab-ci.yml
+
7
−
6
View file @
73857b7b
stages
:
stages
:
-
generate
-
generate
-
eval
-
check
-
check
-
impure
generate-flake-ci
:
generate-flake-ci
:
stage
:
generate
stage
:
generate
script
:
nix run "
.#horizon-gen
-gitlab-ci" > flake-ci.yml
script
:
nix run "
git+https://gitlab.homotopic.tech/haskell/flake-to
-gitlab-ci" > flake-ci.yml
artifacts
:
artifacts
:
paths
:
paths
:
-
flake-ci.yml
-
flake-ci.yml
eval-flake
:
stage
:
eval
script
:
nix flake show
flake-ci
:
flake-ci
:
stage
:
check
stage
:
check
trigger
:
trigger
:
...
@@ -21,3 +17,8 @@ flake-ci:
...
@@ -21,3 +17,8 @@ flake-ci:
-
artifact
:
flake-ci.yml
-
artifact
:
flake-ci.yml
job
:
generate-flake-ci
job
:
generate-flake-ci
strategy
:
depend
strategy
:
depend
impure-tests
:
stage
:
impure
script
:
-
nix run .#run-impure-tests
This diff is collapsed.
Click to expand it.
flake.lock
+
4
−
4
View file @
73857b7b
...
@@ -67,11 +67,11 @@
...
@@ -67,11 +67,11 @@
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs"
},
},
"locked": {
"locked": {
"lastModified": 16
55192403
,
"lastModified": 16
69815989
,
"narHash": "sha256-
XyKDvRGDh8VXA6zN8DUTnDaTMrk0MxMKg70MaAX1A
2Y=",
"narHash": "sha256-
yDE8uxa/O633VeRBlJKSY5q9JtzoBoMANvgupdI4
2Y
I
=",
"ref": "refs/heads/master",
"ref": "refs/heads/master",
"rev": "
a7ae54afdc4c05a5aabf20
2d5a
76d02705eb6147
",
"rev": "
5b97bd76dd6756dfc29a3
2d
2
5a
5c78c0522bac10
",
"revCount":
28
,
"revCount":
39
,
"type": "git",
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
},
},
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
6
−
4
View file @
73857b7b
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
in
in
with
pkgs
.
lib
;
with
pkgs
.
lib
;
with
pkgs
.
writers
;
with
pkgs
.
writers
;
with
lint-utils
.
writers
.
${
system
};
let
let
horizon-gen-nix-app
=
get-flake
horizon-gen-nix
;
horizon-gen-nix-app
=
get-flake
horizon-gen-nix
;
...
@@ -52,12 +53,12 @@
...
@@ -52,12 +53,12 @@
horizon-gen-gitlab-ci
=
writeBashBin
"gen-gitlab-ci"
"
${
pkgs
.
dhall-json
}
/bin/dhall-to-yaml --file .gitlab-ci.dhall"
;
horizon-gen-gitlab-ci
=
writeBashBin
"gen-gitlab-ci"
"
${
pkgs
.
dhall-json
}
/bin/dhall-to-yaml --file .gitlab-ci.dhall"
;
run-impure-tests
=
lint-utils
.
writers
.
writePorcelainOrDieBin
{
run-impure-tests
=
writePorcelainOrDieBin
{
name
=
"run-impure-tests"
;
name
=
"run-impure-tests"
;
src
=
./.
;
src
=
./.
;
command
=
''
command
=
''
export PATH=$PATH:
${
pkgs
.
nix-prefetch-git
}
/bin:
${
pkgs
.
cabal-install
}
/bin
cabal update
cabal update
export PATH=$PATH:
${
pkgs
.
nix-prefetch-git
}
/bin
rm pkgs -rf && nix run .#horizon-gen-nix make-package-set;
rm pkgs -rf && nix run .#horizon-gen-nix make-package-set;
nixpkgs-fmt pkgs/*
nixpkgs-fmt pkgs/*
''
;
''
;
...
@@ -81,11 +82,12 @@
...
@@ -81,11 +82,12 @@
program
=
"
${
horizon-gen-gitlab-ci
}
/bin/gen-gitlab-ci"
;
program
=
"
${
horizon-gen-gitlab-ci
}
/bin/gen-gitlab-ci"
;
};
};
run-impure-tests
=
run-impure-tests-app
;
};
};
checks
=
{
checks
=
{
dhall-format
=
lint-utils
.
outputs
.
linters
.
${
system
}
.
dhall-format
./.
;
dhall-format
=
lint-utils
.
outputs
.
linters
.
${
system
}
.
dhall-format
{
src
=
./.
}
;
nixpkgs-fmt
=
lint-utils
.
outputs
.
linters
.
${
system
}
.
nixpkgs-fmt
./.
;
nixpkgs-fmt
=
lint-utils
.
outputs
.
linters
.
${
system
}
.
nixpkgs-fmt
{
src
=
./.
}
;
};
};
inherit
legacyPackages
;
inherit
legacyPackages
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment