Skip to content

Commit

Permalink
Merge pull request #948 from kamadorueda/main
Browse files Browse the repository at this point in the history
feat(cross): #0 bump to 22.11
  • Loading branch information
kamadorueda authored Oct 2, 2022
2 parents d87b534 + 377d18f commit d24478d
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: richardsimko/update-tag@5bd0e05b035e02d5da3768dbdcfc4e5e0908623e
with:
tag_name: '22.10'
tag_name: '22.11'
env:
GITHUB_TOKEN: ${{ github.token }}
- uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
with:
files: README.md
release: '22.10'
release: '22.11'
prerelease: true
tag: '22.10'
tag: '22.11'
token: ${{ github.token }}
linux_all:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
/helloWorld__1__2__3:
image: ghcr.io/fluidattacks/makes:22.10
image: ghcr.io/fluidattacks/makes:22.11
interruptible: true
needs: []
script:
Expand All @@ -9,7 +9,7 @@
GIT_DEPTH: 1
MAKES_GIT_DEPTH: 1
/lintNix:
image: ghcr.io/fluidattacks/makes:22.10
image: ghcr.io/fluidattacks/makes:22.11
interruptible: true
needs: []
script:
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec:
spec:
containers:
- name: example
image: ghcr.io/fluidattacks/makes:22.10
image: ghcr.io/fluidattacks/makes:22.11
command: [m]
args:
- github:fluidattacks/makes@main
Expand Down Expand Up @@ -152,7 +152,7 @@ Easy, isn't it?
Now 🔥 it up with: `$ m . /deployTerraform/myAwesomeMicroService`

```text
Makes v22.10-linux
Makes v22.11-linux
[INFO] Making environment variables for Terraform for myAwesomeMicroService:
[INFO] - TF_VAR_githubToken from GITHUB_API_TOKEN
Expand Down Expand Up @@ -499,10 +499,10 @@ In order to use Makes you'll need to:

1. Install Makes by running:

`$ nix-env -if https://github.com/fluidattacks/makes/archive/22.10.tar.gz`
`$ nix-env -if https://github.com/fluidattacks/makes/archive/22.11.tar.gz`

We will install two commands in your system:
`$ m`, and `$ m-v22.10`.
`$ m`, and `$ m-v22.11`.

Makes targets two kind of users:

Expand Down Expand Up @@ -606,7 +606,7 @@ for instance:
{
makesSrc = builtins.fetchGit {
url = "https://github.com/fluidattacks/makes";
ref = "refs/tags/22.10";
ref = "refs/tags/22.11";
rev = "" # Add a commit here
};
}
Expand All @@ -617,7 +617,7 @@ for instance:
For the whole ecosystem to work
you need to use the **same version**
of the framework and the CLI.
For example: `22.10`.
For example: `22.11`.

# Configuring CI/CD

Expand Down Expand Up @@ -666,7 +666,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: docker://ghcr.io/fluidattacks/makes:22.10
- uses: docker://ghcr.io/fluidattacks/makes:22.11
# You can use any name you like here
name: helloWorld
# You can pass secrets (if required) as environment variables like this:
Expand All @@ -690,7 +690,7 @@ looks like this:
```yaml
# /path/to/my/project/.gitlab-ci.yaml
/helloWorld:
image: ghcr.io/fluidattacks/makes:22.10
image: ghcr.io/fluidattacks/makes:22.11
script:
- m . /helloWorld 1 2 3
# Add more jobs here, you can copy paste /helloWorld and modify the `script`
Expand All @@ -714,7 +714,7 @@ looks like this:
os: linux
language: nix
nix: 2.3.12
install: nix-env -if https://github.com/fluidattacks/makes/archive/22.10.tar.gz
install: nix-env -if https://github.com/fluidattacks/makes/archive/22.11.tar.gz
env:
global:
# Encrypted environment variable
Expand Down Expand Up @@ -1753,7 +1753,7 @@ Types:
#
# If you need to run jobs on different container images,
# simply create many `aws_batch_job_definition`s
image = "ghcr.io/fluidattacks/makes:22.10"
image = "ghcr.io/fluidattacks/makes:22.11"
# Below arguments can be parametrized later,
# but they are required for the job definition to be created
Expand Down Expand Up @@ -2620,7 +2620,7 @@ for [makeNodeJsEnvironment](#makenodejsenvironment)
like this:
```bash
m github:fluidattacks/makes@22.10 /utils/makeNodeJsLock \
m github:fluidattacks/makes@22.11 /utils/makeNodeJsLock \
"${node_js_version}" \
"${package_json}" \
"${package_lock}"
Expand All @@ -2640,7 +2640,7 @@ for [makePythonPypiEnvironment](#makepythonpypienvironment)
like this:
```bash
m github:fluidattacks/makes@22.10 /utils/makePythonLock \
m github:fluidattacks/makes@22.11 /utils/makePythonLock \
"${python_version}" \
"${dependencies_yaml}" \
"${sources_yaml}"
Expand All @@ -2665,7 +2665,7 @@ psycopg2: "2.9.1"
You can generate an encrypted [Sops][sops] file like this:
```bash
m github:fluidattacks/makes@22.10 /utils/makeSopsEncryptedFile \
m github:fluidattacks/makes@22.11 /utils/makeSopsEncryptedFile \
"${kms_key_arn}" \
"${output}"
```
Expand Down Expand Up @@ -4257,7 +4257,7 @@ $ cat /path/to/my/project/makes/example/dependencies.yaml
Django: "3.2.6"
$ m github:fluidattacks/makes@22.10 /utils/makePythonLock \
$ m github:fluidattacks/makes@22.11 /utils/makePythonLock \
3.8 \
/path/to/my/project/makes/example/dependencies.yaml \
/path/to/my/project/makes/example/sources.yaml
Expand Down Expand Up @@ -5201,7 +5201,7 @@ let
# Import the framework
makes = import "${builtins.fetchGit {
url = "https://github.com/fluidattacks/makes";
ref = "refs/tags/22.10";
ref = "refs/tags/22.11";
rev = "" # Add a commit here
}}/src/args/agnostic.nix" { };
in
Expand Down
2 changes: 1 addition & 1 deletion makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
};
registry = "ghcr.io";
src = outputs."/container-image";
tag = "fluidattacks/makes:22.10";
tag = "fluidattacks/makes:22.11";
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion makes/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
projectPath,
...
}: let
makesVersion = "22.10";
makesVersion = "22.11";
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 @@ -80,7 +80,7 @@
makedirs(join(MAKES_DIR, "cache"), exist_ok=True)
SOURCES_CACHE: str = join(MAKES_DIR, "cache", "sources")
ON_EXIT: List[Callable[[], None]] = []
VERSION: str = "22.10"
VERSION: str = "22.11"

# 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 @@ -95,7 +95,7 @@
name = toJobName output args;
value = attrsMerge [
{
image = "ghcr.io/fluidattacks/makes:22.10";
image = "ghcr.io/fluidattacks/makes:22.11";
interruptible = true;
needs = [];
script =
Expand Down

0 comments on commit d24478d

Please sign in to comment.