Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.
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
16 changes: 0 additions & 16 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,6 @@ jobs:
- name: /formatYaml
run: nix-env -if . && m . /formatYaml

linux_helloWorld:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
name: /helloWorld
with:
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /helloWorld"
macos_helloWorld:
runs-on: macos-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
- name: /helloWorld
run: nix-env -if . && m . /helloWorld

linux_lintBash:
runs-on: ubuntu-latest
steps:
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,26 +213,6 @@ jobs:
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

linux_helloWorld:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
name: /helloWorld
with:
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /helloWorld"
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
macos_helloWorld:
runs-on: macos-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
- name: /helloWorld
run: nix-env -if . && m . /helloWorld
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

linux_lintBash:
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 0 additions & 1 deletion docs/mkdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ nav:
- api/builtins/deploy.md
- api/builtins/development.md
- api/builtins/environment.md
- api/builtins/examples.md
- api/builtins/format.md
- api/builtins/framework-configuration.md
- api/builtins/lint.md
Expand Down
6 changes: 3 additions & 3 deletions docs/src/api/builtins/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ Example:
...
}: {
computeOnAwsBatch = {
helloWorld = {
myJob = {
attempts = 1;
attemptDurationSeconds = 43200;
command = [ "m" "github:fluidattacks/makes@main" "/helloWorld" ];
command = [ "m" "github:fluidattacks/makes@main" "/myJob" ];
definition = "makes";
environment = [ "ENV_VAR_FOR_WHATEVER" ];
memory = 1800;
Expand All @@ -125,7 +125,7 @@ Example:
=== "Invocation"

```bash
m . /computeOnAwsBatch/helloWorld 1 2 3
m . /computeOnAwsBatch/myJob 1 2 3
```

Note that positional arguments (`[ "1" "2" "3" ]` in this case)
Expand Down
30 changes: 0 additions & 30 deletions docs/src/api/builtins/examples.md

This file was deleted.

12 changes: 6 additions & 6 deletions docs/src/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ Example:
name: Makes CI
on: [push, pull_request]
jobs:
helloWorld:
lintNix:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: docker://ghcr.io/fluidattacks/makes:24.12
name: helloWorld
name: lintNix
with:
args: sh -c "chown -R root:root /github/workspace && m . /helloWorld 1 2 3"
args: sh -c "chown -R root:root /github/workspace && m . /lintNix"
```

???+ note
Expand All @@ -103,10 +103,10 @@ Example:

```yaml
# .gitlab-ci.yml
/helloWorld:
/lintNix:
image: ghcr.io/fluidattacks/makes:24.12
script:
- m . /helloWorld 1 2 3
- m . /lintNix
```

=== "Travis CI"
Expand All @@ -119,7 +119,7 @@ Example:
install: nix-env -if https://github.com/fluidattacks/makes/archive/24.12.tar.gz
jobs:
include:
- script: m . /helloWorld 1 2 3
- script: m . /lintNix
```

### Importing via Nix
Expand Down
1 change: 0 additions & 1 deletion src/evaluator/modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
(import ./format-nix/default.nix args)
(import ./format-terraform/default.nix args)
(import ./format-yaml/default.nix args)
(import ./hello-world/default.nix args)
(import ./inputs/default.nix)
(import ./jobs/default.nix args)
(import ./lint-bash/default.nix args)
Expand Down
23 changes: 0 additions & 23 deletions src/evaluator/modules/hello-world/default.nix

This file was deleted.

6 changes: 0 additions & 6 deletions tests/helloWorld/makes.nix

This file was deleted.

1 change: 0 additions & 1 deletion tests/makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
imports = [
./commitlint/makes.nix
./computeOnAwsBatch/makes.nix
./helloWorld/makes.nix
./lintWithAjv/makes.nix
./makeScript/makes.nix
./makeSearchPaths/makes.nix
Expand Down
4 changes: 2 additions & 2 deletions tests/pipelines/.gitlab-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/helloWorld__1__2__3:
/formatNix:
image: ghcr.io/fluidattacks/makes:24.12
interruptible: true
needs: []
script:
- m . /helloWorld '1' '2' '3'
- m . /formatNix
variables:
GIT_DEPTH: 3
MAKES_GIT_DEPTH: 3
Expand Down
11 changes: 1 addition & 10 deletions tests/pipelines/makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@
pipelines = {
example = {
gitlabPath = "/tests/pipelines/.gitlab-ci.yaml";
jobs = [
{
output = "/lintNix";
args = [ ];
}
{
output = "/helloWorld";
args = [ "1" "2" "3" ];
}
];
jobs = [ { output = "/lintNix"; } { output = "/formatNix"; } ];
};
};
}
Loading