From 73ae1cb87c464dc7c1a944dc7e3441ac6911459e Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Tue, 29 Aug 2023 10:24:30 +0900 Subject: [PATCH 1/2] fix(suzuki-shunsuke/circleci-config-merge): follow up changes of circleci-config-merge v1.1.5 Change windows format to zip --- .../circleci-config-merge/pkg.yaml | 8 ++++++-- .../circleci-config-merge/registry.yaml | 20 ++++++++++++------- registry.yaml | 20 ++++++++++++------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml b/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml index 1e186448c29..09ce7bcd59b 100644 --- a/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml +++ b/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml @@ -1,4 +1,8 @@ packages: - - name: suzuki-shunsuke/circleci-config-merge@v1.1.3 + - name: suzuki-shunsuke/circleci-config-merge@v1.1.5 - name: suzuki-shunsuke/circleci-config-merge - version: v1.1.1 + version: v1.1.4-3 + - name: suzuki-shunsuke/circleci-config-merge + version: v1.1.2-1 + - name: suzuki-shunsuke/circleci-config-merge + version: v0.1.0-1 diff --git a/pkgs/suzuki-shunsuke/circleci-config-merge/registry.yaml b/pkgs/suzuki-shunsuke/circleci-config-merge/registry.yaml index 3c6a079509f..d0012d1977d 100644 --- a/pkgs/suzuki-shunsuke/circleci-config-merge/registry.yaml +++ b/pkgs/suzuki-shunsuke/circleci-config-merge/registry.yaml @@ -3,8 +3,11 @@ packages: repo_owner: suzuki-shunsuke repo_name: circleci-config-merge description: Generate .circleci/config.yml by merging multiple files - asset: circleci-config-merge_{{trimV .Version}}_{{.OS}}_amd64.tar.gz - version_constraint: semver(">= 1.1.2") + asset: circleci-config-merge_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} + format: tar.gz + overrides: + - goos: windows + format: zip slsa_provenance: type: github_release asset: multiple.intoto.jsonl @@ -19,8 +22,15 @@ packages: - https://github.com/suzuki-shunsuke/circleci-config-merge/releases/download/{{.Version}}/circleci-config-merge_{{trimV .Version}}_checksums.txt.sig - --certificate - https://github.com/suzuki-shunsuke/circleci-config-merge/releases/download/{{.Version}}/circleci-config-merge_{{trimV .Version}}_checksums.txt.pem + version_constraint: semver(">= 1.1.4-3") version_overrides: - - version_constraint: "true" + - version_constraint: semver(">= 1.1.2-1") + overrides: [] + - version_constraint: semver("< 1.1.2-1") + overrides: [] + supported_envs: + - darwin + - amd64 rosetta2: true slsa_provenance: enabled: false @@ -28,7 +38,3 @@ packages: type: github_release asset: circleci-config-merge_{{trimV .Version}}_checksums.txt algorithm: sha256 - supported_envs: - - windows - - darwin - - linux/amd64 diff --git a/registry.yaml b/registry.yaml index a61ba8ab280..1b4f72a3b96 100644 --- a/registry.yaml +++ b/registry.yaml @@ -23268,8 +23268,11 @@ packages: repo_owner: suzuki-shunsuke repo_name: circleci-config-merge description: Generate .circleci/config.yml by merging multiple files - asset: circleci-config-merge_{{trimV .Version}}_{{.OS}}_amd64.tar.gz - version_constraint: semver(">= 1.1.2") + asset: circleci-config-merge_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} + format: tar.gz + overrides: + - goos: windows + format: zip slsa_provenance: type: github_release asset: multiple.intoto.jsonl @@ -23284,8 +23287,15 @@ packages: - https://github.com/suzuki-shunsuke/circleci-config-merge/releases/download/{{.Version}}/circleci-config-merge_{{trimV .Version}}_checksums.txt.sig - --certificate - https://github.com/suzuki-shunsuke/circleci-config-merge/releases/download/{{.Version}}/circleci-config-merge_{{trimV .Version}}_checksums.txt.pem + version_constraint: semver(">= 1.1.4-3") version_overrides: - - version_constraint: "true" + - version_constraint: semver(">= 1.1.2-1") + overrides: [] + - version_constraint: semver("< 1.1.2-1") + overrides: [] + supported_envs: + - darwin + - amd64 rosetta2: true slsa_provenance: enabled: false @@ -23293,10 +23303,6 @@ packages: type: github_release asset: circleci-config-merge_{{trimV .Version}}_checksums.txt algorithm: sha256 - supported_envs: - - windows - - darwin - - linux/amd64 - type: github_release repo_owner: suzuki-shunsuke repo_name: cmdx From 5b23fcb17d15472b1a49c5d3d7b8945beb581479 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Thu, 31 Aug 2023 08:20:01 +0900 Subject: [PATCH 2/2] fix(suzuki-shunsuke/circleci-config-merge): fix testdata --- pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml b/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml index 09ce7bcd59b..99af9e4b60c 100644 --- a/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml +++ b/pkgs/suzuki-shunsuke/circleci-config-merge/pkg.yaml @@ -1,8 +1,8 @@ packages: - name: suzuki-shunsuke/circleci-config-merge@v1.1.5 - name: suzuki-shunsuke/circleci-config-merge - version: v1.1.4-3 + version: v1.1.3 - name: suzuki-shunsuke/circleci-config-merge - version: v1.1.2-1 + version: v1.1.2 - name: suzuki-shunsuke/circleci-config-merge - version: v0.1.0-1 + version: v0.1.0