From 0c73fc1a3a430405397c6bad8da37a22ca09ee29 Mon Sep 17 00:00:00 2001 From: Daniel Salazar Date: Thu, 12 Dec 2024 21:12:48 -0500 Subject: [PATCH] feat(cross): #1378 new version - Add new 24.12 pre-release version - Make 24.09 stable version Signed-off-by: Daniel Salazar --- .github/workflows/prod.yml | 6 +++--- docs/src/api/builtins/deploy.md | 2 +- docs/src/api/builtins/utilities.md | 4 ++-- docs/src/getting-started.md | 10 +++++----- docs/src/versioning.md | 4 ++-- makes.nix | 2 +- makes/main.nix | 2 +- src/cli/main/cli.py | 2 +- src/evaluator/modules/pipelines/default.nix | 2 +- test/pipelines/.gitlab-ci.yaml | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index eff198f9..8de4d6b4 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -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 diff --git a/docs/src/api/builtins/deploy.md b/docs/src/api/builtins/deploy.md index 45ca512c..6a696fba 100644 --- a/docs/src/api/builtins/deploy.md +++ b/docs/src/api/builtins/deploy.md @@ -292,7 +292,7 @@ Example: } ]; sign = true; - tags = [ "24.09" ]; + tags = [ "24.12" ]; }; }; } diff --git a/docs/src/api/builtins/utilities.md b/docs/src/api/builtins/utilities.md index dd8b0add..d2fd67e1 100644 --- a/docs/src/api/builtins/utilities.md +++ b/docs/src/api/builtins/utilities.md @@ -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}" ``` @@ -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}" diff --git a/docs/src/getting-started.md b/docs/src/getting-started.md index 57fbf766..3470df3d 100644 --- a/docs/src/getting-started.md +++ b/docs/src/getting-started.md @@ -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 @@ -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" @@ -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 ``` @@ -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 @@ -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 diff --git a/docs/src/versioning.md b/docs/src/versioning.md index 7c01df34..5466124d 100644 --- a/docs/src/versioning.md +++ b/docs/src/versioning.md @@ -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"; }; } ``` @@ -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`. diff --git a/makes.nix b/makes.nix index 5aed4aaa..165cfedc 100644 --- a/makes.nix +++ b/makes.nix @@ -58,7 +58,7 @@ } ]; sign = true; - tags = [ "24.09" ]; + tags = [ "24.12" ]; }; }; deployTerraform = { diff --git a/makes/main.nix b/makes/main.nix index 72932976..dbec1a1a 100644 --- a/makes/main.nix +++ b/makes/main.nix @@ -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 = { diff --git a/src/cli/main/cli.py b/src/cli/main/cli.py index 0de0a925..c59b8c2e 100644 --- a/src/cli/main/cli.py +++ b/src/cli/main/cli.py @@ -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__"] diff --git a/src/evaluator/modules/pipelines/default.nix b/src/evaluator/modules/pipelines/default.nix index c76adbe6..018e5d57 100644 --- a/src/evaluator/modules/pipelines/default.nix +++ b/src/evaluator/modules/pipelines/default.nix @@ -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; }; diff --git a/test/pipelines/.gitlab-ci.yaml b/test/pipelines/.gitlab-ci.yaml index b53a3046..ac3a6234 100644 --- a/test/pipelines/.gitlab-ci.yaml +++ b/test/pipelines/.gitlab-ci.yaml @@ -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: @@ -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: