Skip to content

Commit

Permalink
Merge pull request fluidattacks#1406 from dsalaza4/main
Browse files Browse the repository at this point in the history
feat(cross): fluidattacks#1378 new version
  • Loading branch information
jandresh authored Dec 13, 2024
2 parents 06527a7 + 0c73fc1 commit 2fba6e0
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ jobs:
token: ${{ github.token }}
- uses: richardsimko/update-tag@5bd0e05b035e02d5da3768dbdcfc4e5e0908623e
with:
tag_name: "24.09"
tag_name: "24.12"
env:
GITHUB_TOKEN: ${{ github.token }}
- uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
with:
files: README.md
release: "24.09"
release: "24.12"
prerelease: true
tag: "24.09"
tag: "24.12"
token: ${{ github.token }}
linux_all:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion docs/src/api/builtins/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Example:
}
];
sign = true;
tags = [ "24.09" ];
tags = [ "24.12" ];
};
};
}
Expand Down
4 changes: 2 additions & 2 deletions docs/src/api/builtins/utilities.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You can generate a `poetry.lock` for
like this:

```bash
m github:fluidattacks/makes@24.09 /utils/makePythonLock \
m github:fluidattacks/makes@24.12 /utils/makePythonLock \
"${python_version}" \
"${project}"
```
Expand Down Expand Up @@ -45,7 +45,7 @@ You can generate a `sourcesYaml` for
like this:

```bash
m github:fluidattacks/makes@24.09 /utils/makeRubyLock \
m github:fluidattacks/makes@24.12 /utils/makeRubyLock \
"${ruby_version}" \
"${dependencies_yaml}" \
"${sources_yaml}"
Expand Down
10 changes: 5 additions & 5 deletions docs/src/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
1. Install Makes:

```bash
nix-env -if https://github.com/fluidattacks/makes/archive/24.09.tar.gz
nix-env -if https://github.com/fluidattacks/makes/archive/24.12.tar.gz
```

## Usage
Expand Down Expand Up @@ -85,7 +85,7 @@ Example:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: docker://ghcr.io/fluidattacks/makes:24.09
- uses: docker://ghcr.io/fluidattacks/makes:24.12
name: helloWorld
with:
args: sh -c "chown -R root:root /github/workspace && m . /helloWorld 1 2 3"
Expand All @@ -104,7 +104,7 @@ Example:
```yaml
# .gitlab-ci.yml
/helloWorld:
image: ghcr.io/fluidattacks/makes:24.09
image: ghcr.io/fluidattacks/makes:24.12
script:
- m . /helloWorld 1 2 3
```
Expand All @@ -116,7 +116,7 @@ Example:
os: linux
language: nix
nix: 2.3.12
install: nix-env -if https://github.com/fluidattacks/makes/archive/24.09.tar.gz
install: nix-env -if https://github.com/fluidattacks/makes/archive/24.12.tar.gz
jobs:
include:
- script: m . /helloWorld 1 2 3
Expand All @@ -131,7 +131,7 @@ let
# Import the framework
makes = import "${builtins.fetchTarball {
sha256 = ""; # Tarball sha256
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.09";
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.12";
}}/src/args/agnostic.nix" { };
in
# Use the framework
Expand Down
4 changes: 2 additions & 2 deletions docs/src/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ for instance:
{
makesSrc = builtins.fetchTarball {
sha256 = ""; # Tarball sha256
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.09";
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.12";
};
}
```
Expand All @@ -54,4 +54,4 @@ for instance:
For the whole ecosystem to work
you need to use the **same version**
of the framework and the CLI.
For example: `24.09`.
For example: `24.12`.
2 changes: 1 addition & 1 deletion makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
];
sign = true;
tags = [ "24.09" ];
tags = [ "24.12" ];
};
};
deployTerraform = {
Expand Down
2 changes: 1 addition & 1 deletion makes/main.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ __nixpkgs__, makeScript, outputs, projectPath, ... }:
let makesVersion = "24.09";
let makesVersion = "24.12";
in makeScript {
aliases = [ "m-v${makesVersion}" "makes" "makes-v${makesVersion}" ];
replace = {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/main/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
makedirs(MAKES_DIR, exist_ok=True)
SOURCES_CACHE: str = join(MAKES_DIR, "sources")
ON_EXIT: List[Callable[[], None]] = []
VERSION: str = "24.09"
VERSION: str = "24.12"

# Environment
__MAKES_SRC__: str = environ["__MAKES_SRC__"]
Expand Down
2 changes: 1 addition & 1 deletion src/evaluator/modules/pipelines/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
type = lib.types.attrsOf lib.types.anything;
};
image = lib.mkOption {
default = "ghcr.io/fluidattacks/makes:24.09";
default = "ghcr.io/fluidattacks/makes:24.12";
type = lib.types.str;
};
output = lib.mkOption { type = lib.types.str; };
Expand Down
4 changes: 2 additions & 2 deletions test/pipelines/.gitlab-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/helloWorld__1__2__3:
image: ghcr.io/fluidattacks/makes:24.09
image: ghcr.io/fluidattacks/makes:24.12
interruptible: true
needs: []
script:
Expand All @@ -8,7 +8,7 @@
GIT_DEPTH: 3
MAKES_GIT_DEPTH: 3
/lintNix:
image: ghcr.io/fluidattacks/makes:24.09
image: ghcr.io/fluidattacks/makes:24.12
interruptible: true
needs: []
script:
Expand Down

0 comments on commit 2fba6e0

Please sign in to comment.