Skip to content

Commit

Permalink
feat(back): fluidattacks#1122 new monthly version
Browse files Browse the repository at this point in the history
- Release new monthly version 23.07
- Pin 23.06

Signed-off-by: Daniel Salazar <[email protected]>
  • Loading branch information
dsalaza4 committed Jul 14, 2023
1 parent c8411a4 commit fa4e923
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ jobs:
token: ${{ github.token }}
- uses: richardsimko/update-tag@5bd0e05b035e02d5da3768dbdcfc4e5e0908623e
with:
tag_name: "23.06"
tag_name: "23.07"
env:
GITHUB_TOKEN: ${{ github.token }}
- uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
with:
files: README.md
release: "23.06"
release: "23.07"
prerelease: true
tag: "23.06"
tag: "23.07"
token: ${{ github.token }}
linux_all:
runs-on: ubuntu-latest
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@23.06 /utils/makeNodeJsLock \
m github:fluidattacks/makes@23.07 /utils/makeNodeJsLock \
"${node_js_version}" \
"${package_json}" \
"${package_lock}"
Expand All @@ -29,7 +29,7 @@ You can generate a `sourcesYaml` for
like this:

```bash
m github:fluidattacks/makes@23.06 /utils/makePythonLock \
m github:fluidattacks/makes@23.07 /utils/makePythonLock \
"${python_version}" \
"${dependencies_yaml}" \
"${sources_yaml}"
Expand All @@ -55,7 +55,7 @@ You can generate a `sourcesYaml` for
like this:

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

```bash
m github:fluidattacks/makes@23.06 /utils/makeSopsEncryptedFile \
m github:fluidattacks/makes@23.07 /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/23.06.tar.gz
nix-env -if https://github.com/fluidattacks/makes/archive/23.07.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/amd64:23.06
- uses: docker://ghcr.io/fluidattacks/makes/amd64:23.07
name: helloWorld
with:
args: m . /helloWorld 1 2 3
Expand All @@ -96,7 +96,7 @@ Example:
```yaml
# .gitlab-ci.yml
/helloWorld:
image: ghcr.io/fluidattacks/makes/amd64:23.06
image: ghcr.io/fluidattacks/makes/amd64:23.07
script:
- m . /helloWorld 1 2 3
```
Expand All @@ -108,7 +108,7 @@ Example:
os: linux
language: nix
nix: 2.3.12
install: nix-env -if https://github.com/fluidattacks/makes/archive/23.06.tar.gz
install: nix-env -if https://github.com/fluidattacks/makes/archive/23.07.tar.gz
jobs:
include:
- script: m . /helloWorld 1 2 3
Expand All @@ -123,7 +123,7 @@ let
# Import the framework
makes = import "${builtins.fetchGit {
url = "https://github.com/fluidattacks/makes";
ref = "refs/tags/23.06";
ref = "refs/tags/23.07";
rev = ""; # Add a commit here
}}/src/args/agnostic.nix" { };
in
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.fetchGit {
url = "https://github.com/fluidattacks/makes";
ref = "refs/tags/23.06";
ref = "refs/tags/23.07";
rev = ""; # Add a commit here
};
}
Expand All @@ -48,4 +48,4 @@ for instance:
For the whole ecosystem to work
you need to use the **same version**
of the framework and the CLI.
For example: `23.06`.
For example: `23.07`.
4 changes: 2 additions & 2 deletions makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
registry = "ghcr.io";
src = outputs."/container-image";
sign = true;
tag = "fluidattacks/makes/amd64:23.06";
tag = "fluidattacks/makes/amd64:23.07";
};
makesPinnedArm64 = {
attempts = 3;
Expand All @@ -68,7 +68,7 @@
registry = "ghcr.io";
src = outputs."/container-image";
sign = true;
tag = "fluidattacks/makes/arm64:23.06";
tag = "fluidattacks/makes/arm64:23.07";
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion makes/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
projectPath,
...
}: let
makesVersion = "23.06";
makesVersion = "23.07";
in
makeScript {
aliases = [
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 = "23.06"
VERSION: str = "23.07"

# 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 @@ -33,7 +33,7 @@
type = lib.types.attrsOf lib.types.anything;
};
image = lib.mkOption {
default = "ghcr.io/fluidattacks/makes/amd64:23.06";
default = "ghcr.io/fluidattacks/makes/amd64:23.07";
type = lib.types.str;
};
output = lib.mkOption {
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/amd64:23.06
image: ghcr.io/fluidattacks/makes/amd64:23.07
interruptible: true
needs: []
script:
Expand All @@ -8,7 +8,7 @@
GIT_DEPTH: 1
MAKES_GIT_DEPTH: 1
/lintNix:
image: ghcr.io/fluidattacks/makes/amd64:23.06
image: ghcr.io/fluidattacks/makes/amd64:23.07
interruptible: true
needs: []
script:
Expand Down

0 comments on commit fa4e923

Please sign in to comment.