Skip to content

Commit fe78286

Browse files
kamadoruedakamadorueda
committed
fix(cross): #0 versioning scheme
- In september 2022 (22.09), the 22.09 tag, release and container, should be the stable version of Makes, and the 22.10 tag, release and container should be the unstable version. All development that happens during september 2022, should go to the 22.10 tag, release and container, because the docs promise that: "the current month release is frozen", so we shouldn't be modifying 22.09.
1 parent 389c77e commit fe78286

7 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎.github/workflows/prod.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
2424
- uses: richardsimko/update-tag@5bd0e05b035e02d5da3768dbdcfc4e5e0908623e
2525
with:
26-
tag_name: '22.09'
26+
tag_name: '22.10'
2727
env:
2828
GITHUB_TOKEN: ${{ github.token }}
2929
- uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
3030
with:
3131
files: README.md
32-
release: '22.09'
32+
release: '22.10'
3333
prerelease: true
34-
tag: '22.09'
34+
tag: '22.10'
3535
token: ${{ github.token }}
3636
linux_all:
3737
runs-on: ubuntu-latest

‎.gitlab-ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
/helloWorld__1__2__3:
3-
image: ghcr.io/fluidattacks/makes:22.09
3+
image: ghcr.io/fluidattacks/makes:22.10
44
interruptible: true
55
needs: []
66
script:
@@ -9,7 +9,7 @@
99
GIT_DEPTH: 1
1010
MAKES_GIT_DEPTH: 1
1111
/lintNix:
12-
image: ghcr.io/fluidattacks/makes:22.09
12+
image: ghcr.io/fluidattacks/makes:22.10
1313
interruptible: true
1414
needs: []
1515
script:

‎README.md‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
spec:
6161
containers:
6262
- name: example
63-
image: ghcr.io/fluidattacks/makes:22.09
63+
image: ghcr.io/fluidattacks/makes:22.10
6464
command: [m]
6565
args:
6666
- github:fluidattacks/makes@main
@@ -146,7 +146,7 @@ Easy, isn't it?
146146
Now 🔥 it up with: `$ m . /deployTerraform/myAwesomeMicroService`
147147

148148
```text
149-
Makes v22.09-linux
149+
Makes v22.10-linux
150150
151151
[INFO] Making environment variables for Terraform for myAwesomeMicroService:
152152
[INFO] - TF_VAR_githubToken from GITHUB_API_TOKEN
@@ -496,10 +496,10 @@ In order to use Makes you'll need to:
496496

497497
1. Install Makes by running:
498498

499-
`$ nix-env -if https://github.com/fluidattacks/makes/archive/22.09.tar.gz`
499+
`$ nix-env -if https://github.com/fluidattacks/makes/archive/22.10.tar.gz`
500500

501501
We will install two commands in your system:
502-
`$ m`, and `$ m-v22.09`.
502+
`$ m`, and `$ m-v22.10`.
503503

504504
Makes targets two kind of users:
505505

@@ -603,7 +603,8 @@ for instance:
603603
{
604604
makesSrc = builtins.fetchGit {
605605
url = "https://github.com/fluidattacks/makes";
606-
ref = "22.09";
606+
ref = "refs/tags/22.10";
607+
rev = "" # Add a commit here
607608
};
608609
}
609610
```
@@ -613,7 +614,7 @@ for instance:
613614
For the whole ecosystem to work
614615
you need to use the **same version**
615616
of the framework and the CLI.
616-
For example: `22.09`.
617+
For example: `22.10`.
617618

618619
# Configuring CI/CD
619620

@@ -662,7 +663,7 @@ jobs:
662663
runs-on: ubuntu-latest
663664
steps:
664665
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
665-
- uses: docker://ghcr.io/fluidattacks/makes:22.09
666+
- uses: docker://ghcr.io/fluidattacks/makes:22.10
666667
# You can use any name you like here
667668
name: helloWorld
668669
# You can pass secrets (if required) as environment variables like this:
@@ -686,7 +687,7 @@ looks like this:
686687
```yaml
687688
# /path/to/my/project/.gitlab-ci.yaml
688689
/helloWorld:
689-
image: ghcr.io/fluidattacks/makes:22.09
690+
image: ghcr.io/fluidattacks/makes:22.10
690691
script:
691692
- m . /helloWorld 1 2 3
692693
# Add more jobs here, you can copy paste /helloWorld and modify the `script`
@@ -710,7 +711,7 @@ looks like this:
710711
os: linux
711712
language: nix
712713
nix: 2.3.12
713-
install: nix-env -if https://github.com/fluidattacks/makes/archive/22.09.tar.gz
714+
install: nix-env -if https://github.com/fluidattacks/makes/archive/22.10.tar.gz
714715
env:
715716
global:
716717
# Encrypted environment variable
@@ -1749,7 +1750,7 @@ Types:
17491750
#
17501751
# If you need to run jobs on different container images,
17511752
# simply create many `aws_batch_job_definition`s
1752-
image = "ghcr.io/fluidattacks/makes:22.09"
1753+
image = "ghcr.io/fluidattacks/makes:22.10"
17531754
17541755
# Below arguments can be parametrized later,
17551756
# but they are required for the job definition to be created
@@ -2616,7 +2617,7 @@ for [makeNodeJsEnvironment](#makenodejsenvironment)
26162617
like this:
26172618
26182619
```bash
2619-
m github:fluidattacks/makes@22.09 /utils/makeNodeJsLock \
2620+
m github:fluidattacks/makes@22.10 /utils/makeNodeJsLock \
26202621
"${node_js_version}" \
26212622
"${package_json}" \
26222623
"${package_lock}"
@@ -2636,7 +2637,7 @@ for [makePythonPypiEnvironment](#makepythonpypienvironment)
26362637
like this:
26372638
26382639
```bash
2639-
m github:fluidattacks/makes@22.09 /utils/makePythonLock \
2640+
m github:fluidattacks/makes@22.10 /utils/makePythonLock \
26402641
"${python_version}" \
26412642
"${dependencies_yaml}" \
26422643
"${sources_yaml}"
@@ -2661,7 +2662,7 @@ psycopg2: "2.9.1"
26612662
You can generate an encrypted [Sops][sops] file like this:
26622663
26632664
```bash
2664-
m github:fluidattacks/makes@22.09 /utils/makeSopsEncryptedFile \
2665+
m github:fluidattacks/makes@22.10 /utils/makeSopsEncryptedFile \
26652666
"${kms_key_arn}" \
26662667
"${output}"
26672668
```
@@ -4253,7 +4254,7 @@ $ cat /path/to/my/project/makes/example/dependencies.yaml
42534254
42544255
Django: "3.2.6"
42554256
4256-
$ m github:fluidattacks/makes@22.09 /utils/makePythonLock \
4257+
$ m github:fluidattacks/makes@22.10 /utils/makePythonLock \
42574258
3.8 \
42584259
/path/to/my/project/makes/example/dependencies.yaml \
42594260
/path/to/my/project/makes/example/sources.yaml
@@ -5197,7 +5198,8 @@ let
51975198
# Import the framework
51985199
makes = import "${builtins.fetchGit {
51995200
url = "https://github.com/fluidattacks/makes";
5200-
rev = "22.09";
5201+
ref = "refs/tags/22.10";
5202+
rev = "" # Add a commit here
52015203
}}/src/args/agnostic.nix" { };
52025204
in
52035205
# Use the framework

‎default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{system ? builtins.currentSystem}: let
22
args = import ./src/args/agnostic.nix {inherit system;};
3-
makesVersion = "22.09";
3+
makesVersion = "22.10";
44

55
inherit (args) __nixpkgs__;
66
inherit (args) makeScript;

‎makes.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
};
2828
registry = "ghcr.io";
2929
src = outputs."/container-image";
30-
tag = "fluidattacks/makes:22.09";
30+
tag = "fluidattacks/makes:22.10";
3131
};
3232
};
3333
};

‎src/cli/main/__main__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
makedirs(join(MAKES_DIR, "cache"), exist_ok=True)
8181
SOURCES_CACHE: str = join(MAKES_DIR, "cache", "sources")
8282
ON_EXIT: List[Callable[[], None]] = []
83-
VERSION: str = "22.09"
83+
VERSION: str = "22.10"
8484

8585
# Environment
8686
__MAKES_SRC__: str = environ["__MAKES_SRC__"]

‎src/evaluator/modules/pipelines/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
name = toJobName output args;
9393
value = attrsMerge [
9494
{
95-
image = "ghcr.io/fluidattacks/makes:22.09";
95+
image = "ghcr.io/fluidattacks/makes:22.10";
9696
interruptible = true;
9797
needs = [];
9898
script =

0 commit comments

Comments
 (0)