Skip to content
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.

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

feat(back): #1364 new version #1366

Merged
merged 1 commit into from
Aug 12, 2024
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
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.02"
tag_name: "24.09"
env:
GITHUB_TOKEN: ${{ github.token }}
- uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
with:
files: README.md
release: "24.02"
release: "24.09"
prerelease: true
tag: "24.02"
tag: "24.09"
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 @@ -353,7 +353,7 @@ Example:
}
];
sign = true;
tags = [ "24.02" ];
tags = [ "24.09" ];
};
};
}
Expand Down
8 changes: 4 additions & 4 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 `package-lock.json` for
like this:

```bash
m github:fluidattacks/makes@24.02 /utils/makeNodeJsLock \
m github:fluidattacks/makes@24.09 /utils/makeNodeJsLock \
"${node_js_version}" \
"${package_json_dir}" \
"${lockfile_version}"
Expand All @@ -30,7 +30,7 @@ You can generate a `poetry.lock` for
like this:

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

```bash
m github:fluidattacks/makes@24.02 /utils/makeRubyLock \
m github:fluidattacks/makes@24.09 /utils/makeRubyLock \
"${ruby_version}" \
"${dependencies_yaml}" \
"${sources_yaml}"
Expand All @@ -90,7 +90,7 @@ m github:fluidattacks/makes@24.02 /utils/makeRubyLock \
You can generate an encrypted [Sops](https://github.com/mozilla/sops) file like this:

```bash
m github:fluidattacks/makes@24.02 /utils/makeSopsEncryptedFile \
m github:fluidattacks/makes@24.09 /utils/makeSopsEncryptedFile \
"${kms_key_arn}" \
"${output}"
```
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.02.tar.gz
nix-env -if https://github.com/fluidattacks/makes/archive/24.09.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.02
- uses: docker://ghcr.io/fluidattacks/makes:24.09
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.02
image: ghcr.io/fluidattacks/makes:24.09
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.02.tar.gz
install: nix-env -if https://github.com/fluidattacks/makes/archive/24.09.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.02";
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.09";
}}/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.02";
url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.09";
};
}
```
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.02`.
For example: `24.09`.
2 changes: 1 addition & 1 deletion makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}
];
sign = true;
tags = [ "24.02" ];
tags = [ "24.09" ];
};
};
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.02";
let makesVersion = "24.09";
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.02"
VERSION: str = "24.09"

# 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.02";
default = "ghcr.io/fluidattacks/makes:24.09";
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.02
image: ghcr.io/fluidattacks/makes:24.09
interruptible: true
needs: []
script:
Expand All @@ -8,7 +8,7 @@
GIT_DEPTH: 3
MAKES_GIT_DEPTH: 3
/lintNix:
image: ghcr.io/fluidattacks/makes:24.02
image: ghcr.io/fluidattacks/makes:24.09
interruptible: true
needs: []
script:
Expand Down
Loading