diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index da068e7735..b3770df238 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,8 +4,7 @@ on: workflow_dispatch: env: - DEV_IMAGE: ghcr.io/${{ github.repository_owner }}/dev - PRD_IMAGE: ghcr.io/${{ github.repository_owner }}/typegate + REGISTRY_IMAGE: ghcr.io/${{ github.repository_owner }}/dev jobs: builder: @@ -33,28 +32,28 @@ jobs: file: dev/Dockerfile platforms: ${{ matrix.platform }} target: dev - cache-from: type=registry,ref=${{ env.DEV_IMAGE }}:latest - outputs: type=image,name=${{ env.DEV_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=registry,ref=${{ env.REGISTRY_IMAGE }}:base + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - run: | - mkdir -p /tmp/digests/dev + mkdir -p tmp/digests/dev digest="${{ steps.dev.outputs.digest }}" - touch "/tmp/digests/dev/${digest#sha256:}" + touch "tmp/digests/dev/${digest#sha256:}" - uses: docker/build-push-action@v4 id: prd with: file: dev/Dockerfile platforms: ${{ matrix.platform }} target: prd - cache-from: type=registry,ref=${{ env.PRD_IMAGE }}:nightly - outputs: type=image,name=${{ env.PRD_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=registry,ref=${{ env.REGISTRY_IMAGE }}:nightly + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - run: | - mkdir -p /tmp/digests/prd + mkdir -p tmp/digests/prd digest="${{ steps.prd.outputs.digest }}" - touch "/tmp/digests/prd/${digest#sha256:}" + touch "tmp/digests/prd/${digest#sha256:}" - uses: actions/upload-artifact@v3 with: name: digests - path: /tmp/digests/* + path: tmp/digests/* if-no-files-found: error retention-days: 1 @@ -67,14 +66,14 @@ jobs: matrix: include: - target: dev - tag: latest + tag: base - target: prd tag: nightly steps: - uses: actions/download-artifact@v3 with: name: digests - path: /tmp/digests + path: tmp/digests - uses: docker/setup-buildx-action@v2 - id: info run: | @@ -86,8 +85,8 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - working-directory: /tmp/digests/${{ matrix.target }} - run: | + - run: | + cd tmp/digests/${{ matrix.target }} docker buildx imagetools create --tag ${{ steps.info.outputs.image }}:${{ matrix.tag }} $(printf '${{ steps.info.outputs.image }}@sha256:%s ' *) docker buildx imagetools inspect ${{ steps.info.outputs.image }}:${{ matrix.tag }} @@ -102,14 +101,11 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: "docker://us-docker.pkg.dev/gcr-cleaner/gcr-cleaner/gcr-cleaner-cli" - with: - args: -repo=${{ env.DEV_IMAGE }} -repo=${{ env.PRD_IMAGE }} - uses: snok/container-retention-policy@v2 with: account-type: org org-name: metatypedev - image-names: dev,typegate - cut-off: now UTC + image-names: dev,nightly + cut-off: 12 hours ago UTC untagged-only: true token: ${{ secrets.PACKAGE_DELETER_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 86e7fa4a06..1408a334ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -976,7 +976,7 @@ dependencies = [ [[package]] name = "common" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "anyhow", "base64 0.21.2", @@ -3172,7 +3172,7 @@ dependencies = [ [[package]] name = "macros" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "proc-macro2", "quote", @@ -3264,7 +3264,7 @@ dependencies = [ [[package]] name = "meta-cli" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "anyhow", "assert_cmd", @@ -3674,7 +3674,7 @@ dependencies = [ [[package]] name = "native" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "anyhow", "base64 0.21.2", @@ -7450,7 +7450,7 @@ dependencies = [ [[package]] name = "typegraph_core" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "common", "enum_dispatch", @@ -7475,7 +7475,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typescript" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "anyhow", "dprint-plugin-typescript", @@ -8332,7 +8332,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.1.13-0+dev" +version = "0.1.14" dependencies = [ "anyhow", "clap", diff --git a/dev/lock.yml b/dev/lock.yml index 7596e4cc1f..f3daa50e74 100644 --- a/dev/lock.yml +++ b/dev/lock.yml @@ -71,7 +71,7 @@ dev: WASMTIME_VERSION: 10.0.1 WASMEDGE_VERSION: 0.12.1 TYPEGRAPH_VERSION: 0.0.2 - METATYPE_VERSION: 0.1.13-0+dev + METATYPE_VERSION: 0.1.14 TAGLINE: >- Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems diff --git a/examples/templates/new/compose.yml b/examples/templates/new/compose.yml index 621a93ed03..65b0a507a4 100644 --- a/examples/templates/new/compose.yml +++ b/examples/templates/new/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.1.13-0+dev + image: ghcr.io/metatypedev/typegate:v0.1.14 platform: linux/amd64 restart: always ports: diff --git a/examples/templates/new/pyproject.toml b/examples/templates/new/pyproject.toml index b84cfdf273..450f4c52bf 100644 --- a/examples/templates/new/pyproject.toml +++ b/examples/templates/new/pyproject.toml @@ -1,13 +1,13 @@ [tool.poetry] name = "example" -version = "0.1.13-0+dev" +version = "0.1.14" description = "" authors = [] readme = "README.md" [tool.poetry.dependencies] python = ">=3.8,<4.0" -typegraph = "0.1.13-0+dev" +typegraph = "0.1.14" [build-system] requires = ["poetry-core"] diff --git a/libs/common/Cargo.toml b/libs/common/Cargo.toml index 8bebcdaa30..60149f86e4 100644 --- a/libs/common/Cargo.toml +++ b/libs/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [dependencies] diff --git a/libs/macros/Cargo.toml b/libs/macros/Cargo.toml index ee1594c383..306001c7c3 100644 --- a/libs/macros/Cargo.toml +++ b/libs/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "macros" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [lib] diff --git a/libs/typescript/Cargo.toml b/libs/typescript/Cargo.toml index 266dc5b92d..4e9d2e6ce7 100644 --- a/libs/typescript/Cargo.toml +++ b/libs/typescript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "typescript" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [dependencies] diff --git a/libs/xtask/Cargo.toml b/libs/xtask/Cargo.toml index acad3e36d1..24e948de73 100644 --- a/libs/xtask/Cargo.toml +++ b/libs/xtask/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xtask" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [dependencies] diff --git a/meta-cli/Cargo.toml b/meta-cli/Cargo.toml index c43e2e8402..81b01bb194 100644 --- a/meta-cli/Cargo.toml +++ b/meta-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meta-cli" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" description = "Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems are." diff --git a/pyproject.toml b/pyproject.toml index 4b8718883d..b6a0fd5e25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "metatype" -version = "0.1.13-0+dev" +version = "0.1.14" description = "" authors = [] diff --git a/typegate/native/Cargo.toml b/typegate/native/Cargo.toml index 40eb336f16..f8fd6cdab8 100644 --- a/typegate/native/Cargo.toml +++ b/typegate/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "native" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [lib] diff --git a/typegate/tests/runtimes/wasmedge/rust/Cargo.toml b/typegate/tests/runtimes/wasmedge/rust/Cargo.toml index c7ab702842..c51602b6d7 100644 --- a/typegate/tests/runtimes/wasmedge/rust/Cargo.toml +++ b/typegate/tests/runtimes/wasmedge/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [lib] diff --git a/typegraph/core/Cargo.toml b/typegraph/core/Cargo.toml index 06fa3e0e8b..11ced629f9 100644 --- a/typegraph/core/Cargo.toml +++ b/typegraph/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "typegraph_core" -version = "0.1.13-0+dev" +version = "0.1.14" edition = "2021" [lib] diff --git a/typegraph/python/pyproject.toml b/typegraph/python/pyproject.toml index 3b0b13cdf4..7b1f661911 100644 --- a/typegraph/python/pyproject.toml +++ b/typegraph/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "typegraph" -version = "0.1.13-0+dev" +version = "0.1.14" description = "Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems are." authors = ["Metatype Contributors "] license = "MPL-2.0" diff --git a/typegraph/python/typegraph/__init__.py b/typegraph/python/typegraph/__init__.py index e34d5a354e..ebd2ed0d15 100644 --- a/typegraph/python/typegraph/__init__.py +++ b/typegraph/python/typegraph/__init__.py @@ -5,4 +5,4 @@ from typegraph import types as t # noqa from typegraph.graph.typegraph import TypeGraph # noqa -version = "0.1.13-0+dev" +version = "0.1.14" diff --git a/typegraph/python_next/pyproject.toml b/typegraph/python_next/pyproject.toml index 2526567d26..d3e2b3d5ff 100644 --- a/typegraph/python_next/pyproject.toml +++ b/typegraph/python_next/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "typegraph_next" -version = "0.1.13-0+dev" +version = "0.1.14" description = "Declarative API development platform. Build serverless backends with zero-trust and less code, no matter where and how your (legacy) systems are." authors = ["Metatype Contributors "] license = "MPL-2.0" diff --git a/typegraph/python_next/typegraph_next/__init__.py b/typegraph/python_next/typegraph_next/__init__.py index 913d3e7f23..cc1cd0b2e7 100644 --- a/typegraph/python_next/typegraph_next/__init__.py +++ b/typegraph/python_next/typegraph_next/__init__.py @@ -5,4 +5,4 @@ from typegraph_next.policy import Policy # noqa from typegraph_next import effects as fx # noqa -version = "0.1.13-0+dev" +version = "0.1.14"