From 5bb63504dff55ee8d07fc3fd83c0ed222e05cbf9 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 18:50:00 +0900 Subject: [PATCH 1/7] refactor: refactor with aqua v2.13.0's new features --- .../config-file-validator/registry.yaml | 49 ++++-------- pkgs/josephburnett/jd/registry.yaml | 30 +++---- registry.yaml | 79 ++++++------------- 3 files changed, 48 insertions(+), 110 deletions(-) diff --git a/pkgs/Boeing/config-file-validator/registry.yaml b/pkgs/Boeing/config-file-validator/registry.yaml index 3a9231367a8..f2dc8cc69be 100644 --- a/pkgs/Boeing/config-file-validator/registry.yaml +++ b/pkgs/Boeing/config-file-validator/registry.yaml @@ -9,14 +9,12 @@ packages: - goos: windows goarch: amd64 asset: validator-{{trimV .Version}} - - goos: linux - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: windows - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator + supported_envs: + - darwin + - amd64 + build: + type: go_install + path: github.com/Boeing/config-file-validator/cmd/validator files: - name: validator replacements: @@ -30,43 +28,26 @@ packages: - goos: windows goarch: amd64 asset: validator - - goos: linux - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: windows - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - version_constraint: semver(">= 1.0.1") asset: validator.{{.OS}}-{{.Arch}} overrides: - goos: windows goarch: amd64 asset: validator - - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: darwin - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator replacements: {} - version_constraint: Version == "v1.0.0" asset: validator.{{.OS}}-{{.Arch}} replacements: {} + supported_envs: + - linux/amd64 + - windows/amd64 + build: + type: go_build + files: + - name: validator + src: ./cmd/validator + dir: config-file-validator-{{trimV .Version}} overrides: - goos: windows goarch: amd64 asset: validator - - goarch: arm64 - type: go_build - files: - - name: validator - src: ./cmd/validator - dir: config-file-validator-{{trimV .Version}} - - goos: darwin - type: go_build - files: - - name: validator - src: ./cmd/validator - dir: config-file-validator-{{trimV .Version}} diff --git a/pkgs/josephburnett/jd/registry.yaml b/pkgs/josephburnett/jd/registry.yaml index c29417bc1bc..a2a79a5f3c8 100644 --- a/pkgs/josephburnett/jd/registry.yaml +++ b/pkgs/josephburnett/jd/registry.yaml @@ -5,6 +5,8 @@ packages: description: JSON diff and patch asset: jd-{{.Arch}}-{{.OS}} format: raw + build: + type: go_install version_constraint: semver(">= 1.6.1") version_overrides: - version_constraint: semver(">= 1.5.0") @@ -12,30 +14,16 @@ packages: - version_constraint: Version == "v1.4.0" complete_windows_ext: false rosetta2: true - overrides: - - goos: linux - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd - - goos: windows - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd + supported_envs: + - darwin + - amd64 - version_constraint: semver(">= 1.2.0") asset: jd - overrides: - - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd - - goos: darwin - goarch: amd64 - type: go_install - path: github.com/josephburnett/jd - - goos: windows - goarch: amd64 - type: go_install - path: github.com/josephburnett/jd + supported_envs: + - linux/amd64 - version_constraint: semver("< 1.2.0") asset: jd supported_envs: - linux/amd64 + build: + enabled: false diff --git a/registry.yaml b/registry.yaml index 2b3caca2bae..25560d1e86f 100644 --- a/registry.yaml +++ b/registry.yaml @@ -351,14 +351,12 @@ packages: - goos: windows goarch: amd64 asset: validator-{{trimV .Version}} - - goos: linux - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: windows - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator + supported_envs: + - darwin + - amd64 + build: + type: go_install + path: github.com/Boeing/config-file-validator/cmd/validator files: - name: validator replacements: @@ -372,46 +370,29 @@ packages: - goos: windows goarch: amd64 asset: validator - - goos: linux - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: windows - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - version_constraint: semver(">= 1.0.1") asset: validator.{{.OS}}-{{.Arch}} overrides: - goos: windows goarch: amd64 asset: validator - - goarch: arm64 - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator - - goos: darwin - type: go_install - path: github.com/Boeing/config-file-validator/cmd/validator replacements: {} - version_constraint: Version == "v1.0.0" asset: validator.{{.OS}}-{{.Arch}} replacements: {} + supported_envs: + - linux/amd64 + - windows/amd64 + build: + type: go_build + files: + - name: validator + src: ./cmd/validator + dir: config-file-validator-{{trimV .Version}} overrides: - goos: windows goarch: amd64 asset: validator - - goarch: arm64 - type: go_build - files: - - name: validator - src: ./cmd/validator - dir: config-file-validator-{{trimV .Version}} - - goos: darwin - type: go_build - files: - - name: validator - src: ./cmd/validator - dir: config-file-validator-{{trimV .Version}} - type: github_release repo_owner: Builditluc repo_name: wiki-tui @@ -15298,6 +15279,8 @@ packages: description: JSON diff and patch asset: jd-{{.Arch}}-{{.OS}} format: raw + build: + type: go_install version_constraint: semver(">= 1.6.1") version_overrides: - version_constraint: semver(">= 1.5.0") @@ -15305,33 +15288,19 @@ packages: - version_constraint: Version == "v1.4.0" complete_windows_ext: false rosetta2: true - overrides: - - goos: linux - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd - - goos: windows - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd + supported_envs: + - darwin + - amd64 - version_constraint: semver(">= 1.2.0") asset: jd - overrides: - - goarch: arm64 - type: go_install - path: github.com/josephburnett/jd - - goos: darwin - goarch: amd64 - type: go_install - path: github.com/josephburnett/jd - - goos: windows - goarch: amd64 - type: go_install - path: github.com/josephburnett/jd + supported_envs: + - linux/amd64 - version_constraint: semver("< 1.2.0") asset: jd supported_envs: - linux/amd64 + build: + enabled: false - type: github_release repo_owner: joshdk repo_name: retry From d6d88e5fb5e478c9bae00fcafa2dbeb2d7bc293a Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 18:58:09 +0900 Subject: [PATCH 2/7] fix(Boeing/config-file-validator): fix supported_envs --- pkgs/Boeing/config-file-validator/registry.yaml | 3 +++ registry.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/Boeing/config-file-validator/registry.yaml b/pkgs/Boeing/config-file-validator/registry.yaml index f2dc8cc69be..5ea1dedde43 100644 --- a/pkgs/Boeing/config-file-validator/registry.yaml +++ b/pkgs/Boeing/config-file-validator/registry.yaml @@ -35,6 +35,9 @@ packages: goarch: amd64 asset: validator replacements: {} + supported_envs: + - linux/amd64 + - windows/amd64 - version_constraint: Version == "v1.0.0" asset: validator.{{.OS}}-{{.Arch}} replacements: {} diff --git a/registry.yaml b/registry.yaml index 25560d1e86f..3a99605bb8e 100644 --- a/registry.yaml +++ b/registry.yaml @@ -377,6 +377,9 @@ packages: goarch: amd64 asset: validator replacements: {} + supported_envs: + - linux/amd64 + - windows/amd64 - version_constraint: Version == "v1.0.0" asset: validator.{{.OS}}-{{.Arch}} replacements: {} From 2cbd0c3ab9281475264f99262a4f7ec608ec0567 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 20:35:48 +0900 Subject: [PATCH 3/7] fix: refactor kalker and tokei --- pkgs/PaddiM8/kalker/registry.yaml | 9 ++------- pkgs/XAMPPRocky/tokei/registry.yaml | 5 +++-- registry.yaml | 14 +++++--------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/PaddiM8/kalker/registry.yaml b/pkgs/PaddiM8/kalker/registry.yaml index ab8185137eb..ab12ba05a2b 100644 --- a/pkgs/PaddiM8/kalker/registry.yaml +++ b/pkgs/PaddiM8/kalker/registry.yaml @@ -3,12 +3,11 @@ packages: repo_owner: PaddiM8 repo_name: kalker description: Kalker is a calculator program that supports user-defined variables, functions, differentiation, and integration - asset: kalker-{{.OS}}.{{.Format}} + asset: kalker-{{.OS}} format: zip overrides: - goos: linux format: raw - asset: kalker-{{.OS}} replacements: darwin: macOS supported_envs: @@ -21,11 +20,7 @@ packages: version_constraint: semver(">= 1.0.0") version_overrides: - version_constraint: semver(">= 0.3.4") - asset: kalk-{{.OS}}.{{.Format}} - overrides: - - goos: linux - format: raw - asset: kalk-{{.OS}} + asset: kalk-{{.OS}} files: - name: kalker src: target/release/kalk diff --git a/pkgs/XAMPPRocky/tokei/registry.yaml b/pkgs/XAMPPRocky/tokei/registry.yaml index 9e5fc3226be..f97f192d45d 100644 --- a/pkgs/XAMPPRocky/tokei/registry.yaml +++ b/pkgs/XAMPPRocky/tokei/registry.yaml @@ -3,7 +3,8 @@ packages: repo_owner: XAMPPRocky repo_name: tokei rosetta2: true - asset: tokei-{{.Arch}}-{{.OS}}.tar.gz + asset: tokei-{{.Arch}}-{{.OS}} + format: tar.gz description: Count your code, quickly supported_envs: - darwin @@ -12,9 +13,9 @@ packages: replacements: darwin: apple-darwin linux: unknown-linux-gnu + windows: pc-windows-msvc amd64: x86_64 arm64: aarch64 overrides: - goos: windows - asset: tokei-{{.Arch}}-pc-windows-msvc.exe format: raw diff --git a/registry.yaml b/registry.yaml index 49c597dc670..3eca6281bc0 100644 --- a/registry.yaml +++ b/registry.yaml @@ -1379,12 +1379,11 @@ packages: repo_owner: PaddiM8 repo_name: kalker description: Kalker is a calculator program that supports user-defined variables, functions, differentiation, and integration - asset: kalker-{{.OS}}.{{.Format}} + asset: kalker-{{.OS}} format: zip overrides: - goos: linux format: raw - asset: kalker-{{.OS}} replacements: darwin: macOS supported_envs: @@ -1397,11 +1396,7 @@ packages: version_constraint: semver(">= 1.0.0") version_overrides: - version_constraint: semver(">= 0.3.4") - asset: kalk-{{.OS}}.{{.Format}} - overrides: - - goos: linux - format: raw - asset: kalk-{{.OS}} + asset: kalk-{{.OS}} files: - name: kalker src: target/release/kalk @@ -3063,7 +3058,8 @@ packages: repo_owner: XAMPPRocky repo_name: tokei rosetta2: true - asset: tokei-{{.Arch}}-{{.OS}}.tar.gz + asset: tokei-{{.Arch}}-{{.OS}} + format: tar.gz description: Count your code, quickly supported_envs: - darwin @@ -3072,11 +3068,11 @@ packages: replacements: darwin: apple-darwin linux: unknown-linux-gnu + windows: pc-windows-msvc amd64: x86_64 arm64: aarch64 overrides: - goos: windows - asset: tokei-{{.Arch}}-pc-windows-msvc.exe format: raw - type: github_release repo_owner: a8m From 4eab0cf91aa73445e70f7be1ad82c38682c293bb Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 20:41:22 +0900 Subject: [PATCH 4/7] refactor: refactor gomi and yo --- pkgs/babarot/gomi/registry.yaml | 4 ++-- pkgs/cloudspannerecosystem/yo/registry.yaml | 4 ++-- registry.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/babarot/gomi/registry.yaml b/pkgs/babarot/gomi/registry.yaml index d36059e6cad..8b31918c5de 100644 --- a/pkgs/babarot/gomi/registry.yaml +++ b/pkgs/babarot/gomi/registry.yaml @@ -4,8 +4,9 @@ packages: repo_name: gomi aliases: - name: b4b4r07/gomi - asset: gomi_{{.OS}}_{{.Arch}}.tar.gz description: Replacement for UNIX rm command + asset: gomi_{{.OS}}_{{.Arch}} + format: tar.gz replacements: amd64: x86_64 supported_envs: @@ -19,7 +20,6 @@ packages: - darwin rosetta2: true - version_constraint: "true" - asset: gomi_{{.OS}}_{{.Arch}} format: raw replacements: {} supported_envs: diff --git a/pkgs/cloudspannerecosystem/yo/registry.yaml b/pkgs/cloudspannerecosystem/yo/registry.yaml index c9831d63638..6f813e5d049 100644 --- a/pkgs/cloudspannerecosystem/yo/registry.yaml +++ b/pkgs/cloudspannerecosystem/yo/registry.yaml @@ -2,7 +2,7 @@ packages: - type: github_release repo_owner: cloudspannerecosystem repo_name: yo - asset: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + asset: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}} format: tar.gz description: yo is a command-line tool to generate Go code for Google Cloud Spanner overrides: @@ -10,7 +10,7 @@ packages: format: zip files: - name: yo - src: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}}/yo + src: "{{.AssetWithoutExt}}/yo" checksum: type: github_release asset: checksums.txt diff --git a/registry.yaml b/registry.yaml index 3eca6281bc0..de4e9a30fde 100644 --- a/registry.yaml +++ b/registry.yaml @@ -4751,8 +4751,9 @@ packages: repo_name: gomi aliases: - name: b4b4r07/gomi - asset: gomi_{{.OS}}_{{.Arch}}.tar.gz description: Replacement for UNIX rm command + asset: gomi_{{.OS}}_{{.Arch}} + format: tar.gz replacements: amd64: x86_64 supported_envs: @@ -4766,7 +4767,6 @@ packages: - darwin rosetta2: true - version_constraint: "true" - asset: gomi_{{.OS}}_{{.Arch}} format: raw replacements: {} supported_envs: @@ -7274,7 +7274,7 @@ packages: - type: github_release repo_owner: cloudspannerecosystem repo_name: yo - asset: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + asset: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}} format: tar.gz description: yo is a command-line tool to generate Go code for Google Cloud Spanner overrides: @@ -7282,7 +7282,7 @@ packages: format: zip files: - name: yo - src: yo-{{trimV .Version}}-{{.OS}}-{{.Arch}}/yo + src: "{{.AssetWithoutExt}}/yo" checksum: type: github_release asset: checksums.txt From cd30d242c2bd1b563f18c00fb242b6fd9d5225a0 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 20:48:40 +0900 Subject: [PATCH 5/7] refactor: refactor aks-engine, azure-dev, ripgrep --- pkgs/Azure/aks-engine/registry.yaml | 2 +- pkgs/Azure/azure-dev/registry.yaml | 6 +++--- pkgs/BurntSushi/ripgrep/registry.yaml | 4 ++-- registry.yaml | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/Azure/aks-engine/registry.yaml b/pkgs/Azure/aks-engine/registry.yaml index b7ab72207d7..55b41588cec 100644 --- a/pkgs/Azure/aks-engine/registry.yaml +++ b/pkgs/Azure/aks-engine/registry.yaml @@ -10,4 +10,4 @@ packages: asset: aks-engine-{{.Version}}-{{.OS}}-{{.Arch}}.tar.gz files: - name: aks-engine - src: aks-engine-{{.Version}}-{{.OS}}-{{.Arch}}/aks-engine + src: "{{.AssetWithoutExt}}/aks-engine" diff --git a/pkgs/Azure/azure-dev/registry.yaml b/pkgs/Azure/azure-dev/registry.yaml index 8c8a5ed4451..4c2927af78e 100644 --- a/pkgs/Azure/azure-dev/registry.yaml +++ b/pkgs/Azure/azure-dev/registry.yaml @@ -2,15 +2,15 @@ packages: - type: github_release repo_owner: Azure repo_name: azure-dev - asset: azd-{{.OS}}-{{.Arch}}.{{.Format}} - format: zip description: The Azure Developer CLI is a developer-centric command-line interface tool for creating Azure applications + asset: azd-{{.OS}}-{{.Arch}} + format: zip overrides: - goos: linux format: tar.gz files: - name: azd - src: azd-{{.OS}}-{{.Arch}} + src: "{{.AssetWithoutExt}}" supported_envs: - darwin - amd64 diff --git a/pkgs/BurntSushi/ripgrep/registry.yaml b/pkgs/BurntSushi/ripgrep/registry.yaml index 3c977da96ec..81f9808b947 100644 --- a/pkgs/BurntSushi/ripgrep/registry.yaml +++ b/pkgs/BurntSushi/ripgrep/registry.yaml @@ -2,8 +2,8 @@ packages: - type: github_release repo_owner: BurntSushi repo_name: ripgrep - asset: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}} description: ripgrep recursively searches directories for a regex pattern while respecting your gitignore + asset: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}} rosetta2: true supported_envs: - darwin @@ -19,4 +19,4 @@ packages: format: zip files: - name: rg - src: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}}/rg + src: "{{.AssetWithoutExt}}/rg" diff --git a/registry.yaml b/registry.yaml index de4e9a30fde..12c84a6257d 100644 --- a/registry.yaml +++ b/registry.yaml @@ -196,7 +196,7 @@ packages: asset: aks-engine-{{.Version}}-{{.OS}}-{{.Arch}}.tar.gz files: - name: aks-engine - src: aks-engine-{{.Version}}-{{.OS}}-{{.Arch}}/aks-engine + src: "{{.AssetWithoutExt}}/aks-engine" - type: github_release repo_owner: Azure repo_name: aztfexport @@ -248,15 +248,15 @@ packages: - type: github_release repo_owner: Azure repo_name: azure-dev - asset: azd-{{.OS}}-{{.Arch}}.{{.Format}} - format: zip description: The Azure Developer CLI is a developer-centric command-line interface tool for creating Azure applications + asset: azd-{{.OS}}-{{.Arch}} + format: zip overrides: - goos: linux format: tar.gz files: - name: azd - src: azd-{{.OS}}-{{.Arch}} + src: "{{.AssetWithoutExt}}" supported_envs: - darwin - amd64 @@ -436,8 +436,8 @@ packages: - type: github_release repo_owner: BurntSushi repo_name: ripgrep - asset: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}} description: ripgrep recursively searches directories for a regex pattern while respecting your gitignore + asset: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}} rosetta2: true supported_envs: - darwin @@ -453,7 +453,7 @@ packages: format: zip files: - name: rg - src: ripgrep-{{.Version}}-{{.Arch}}-{{.OS}}/rg + src: "{{.AssetWithoutExt}}/rg" - type: github_release repo_owner: Byron repo_name: dua-cli From 725b360512f66582a4c4c81be9690e488bf986db Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 20:58:05 +0900 Subject: [PATCH 6/7] refactor: refactor packages --- pkgs/Byron/dua-cli/registry.yaml | 8 +++---- .../circleci-cli/registry.yaml | 6 ++--- pkgs/Dreamacro/clash/registry.yaml | 6 ++--- pkgs/GoodwayGroup/gwvault/registry.yaml | 2 +- registry.yaml | 22 +++++++++---------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/Byron/dua-cli/registry.yaml b/pkgs/Byron/dua-cli/registry.yaml index 2bfcbd49d61..699e2b05eb2 100644 --- a/pkgs/Byron/dua-cli/registry.yaml +++ b/pkgs/Byron/dua-cli/registry.yaml @@ -3,10 +3,10 @@ packages: repo_owner: Byron repo_name: dua-cli description: View disk space usage and delete unwanted data, fast - asset: dua-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}} + asset: dua-{{.Version}}-{{.Arch}}-{{.OS}} files: - name: dua - src: dua-{{.Version}}-{{.Arch}}-{{.OS}}/dua + src: "{{.AssetWithoutExt}}/dua" format: tar.gz overrides: - goos: windows @@ -22,7 +22,7 @@ packages: rosetta2: true version_constraint: semver(">= 2.20.1") version_overrides: - - version_constraint: semver(">= 2.20.0") + - version_constraint: Version == "v2.20.0" format: zip overrides: - goos: darwin @@ -35,7 +35,7 @@ packages: - darwin - windows/amd64 - version_constraint: semver(">= 2.10.4") - - version_constraint: semver(">= 2.10.3") + - version_constraint: Version == "v2.10.3" overrides: [] - version_constraint: semver(">= 2.6.0") - version_constraint: semver("< 2.6.0") diff --git a/pkgs/CircleCI-Public/circleci-cli/registry.yaml b/pkgs/CircleCI-Public/circleci-cli/registry.yaml index 5c2685428a2..9c76925cb7a 100644 --- a/pkgs/CircleCI-Public/circleci-cli/registry.yaml +++ b/pkgs/CircleCI-Public/circleci-cli/registry.yaml @@ -4,7 +4,7 @@ packages: repo_name: circleci-cli description: Use CircleCI from the command line rosetta2: true - asset: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} + asset: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}} supported_envs: - darwin - linux @@ -15,10 +15,10 @@ packages: format: zip files: - name: circleci - src: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}}/circleci + src: "{{.AssetWithoutExt}}/circleci" version_constraint: semver(">= 0.1.17554") version_overrides: - - version_constraint: "true" + - version_constraint: semver("< 0.1.17554") supported_envs: - darwin - amd64 diff --git a/pkgs/Dreamacro/clash/registry.yaml b/pkgs/Dreamacro/clash/registry.yaml index cc960380d15..9107018eae6 100644 --- a/pkgs/Dreamacro/clash/registry.yaml +++ b/pkgs/Dreamacro/clash/registry.yaml @@ -2,16 +2,16 @@ packages: - type: github_release repo_owner: Dreamacro repo_name: clash - asset: clash-{{.OS}}-{{.Arch}}-{{.Version}}.{{.Format}} + description: A rule-based tunnel in Go + asset: clash-{{.OS}}-{{.Arch}}-{{.Version}} supported_envs: - windows - darwin - linux/amd64 - description: A rule-based tunnel in Go format: gz files: - name: clash - src: clash-{{.OS}}-{{.Arch}}-{{.Version}} + src: "{{.AssetWithoutExt}}" overrides: - goos: windows format: zip diff --git a/pkgs/GoodwayGroup/gwvault/registry.yaml b/pkgs/GoodwayGroup/gwvault/registry.yaml index 2c13182e591..15dc8f04a84 100644 --- a/pkgs/GoodwayGroup/gwvault/registry.yaml +++ b/pkgs/GoodwayGroup/gwvault/registry.yaml @@ -10,7 +10,7 @@ packages: asset: gwvault_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} files: - name: gwvault - src: gwvault_{{trimV .Version}}_{{.OS}}_{{.Arch}}/gwvault + src: "{{.AssetWithoutExt}}/gwvault" format: tar.gz overrides: - goos: windows diff --git a/registry.yaml b/registry.yaml index 12c84a6257d..0eb42422286 100644 --- a/registry.yaml +++ b/registry.yaml @@ -458,10 +458,10 @@ packages: repo_owner: Byron repo_name: dua-cli description: View disk space usage and delete unwanted data, fast - asset: dua-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}} + asset: dua-{{.Version}}-{{.Arch}}-{{.OS}} files: - name: dua - src: dua-{{.Version}}-{{.Arch}}-{{.OS}}/dua + src: "{{.AssetWithoutExt}}/dua" format: tar.gz overrides: - goos: windows @@ -477,7 +477,7 @@ packages: rosetta2: true version_constraint: semver(">= 2.20.1") version_overrides: - - version_constraint: semver(">= 2.20.0") + - version_constraint: Version == "v2.20.0" format: zip overrides: - goos: darwin @@ -490,7 +490,7 @@ packages: - darwin - windows/amd64 - version_constraint: semver(">= 2.10.4") - - version_constraint: semver(">= 2.10.3") + - version_constraint: Version == "v2.10.3" overrides: [] - version_constraint: semver(">= 2.6.0") - version_constraint: semver("< 2.6.0") @@ -524,7 +524,7 @@ packages: repo_name: circleci-cli description: Use CircleCI from the command line rosetta2: true - asset: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} + asset: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}} supported_envs: - darwin - linux @@ -535,10 +535,10 @@ packages: format: zip files: - name: circleci - src: circleci-cli_{{trimV .Version}}_{{.OS}}_{{.Arch}}/circleci + src: "{{.AssetWithoutExt}}/circleci" version_constraint: semver(">= 0.1.17554") version_overrides: - - version_constraint: "true" + - version_constraint: semver("< 0.1.17554") supported_envs: - darwin - amd64 @@ -654,16 +654,16 @@ packages: - type: github_release repo_owner: Dreamacro repo_name: clash - asset: clash-{{.OS}}-{{.Arch}}-{{.Version}}.{{.Format}} + description: A rule-based tunnel in Go + asset: clash-{{.OS}}-{{.Arch}}-{{.Version}} supported_envs: - windows - darwin - linux/amd64 - description: A rule-based tunnel in Go format: gz files: - name: clash - src: clash-{{.OS}}-{{.Arch}}-{{.Version}} + src: "{{.AssetWithoutExt}}" overrides: - goos: windows format: zip @@ -800,7 +800,7 @@ packages: asset: gwvault_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}} files: - name: gwvault - src: gwvault_{{trimV .Version}}_{{.OS}}_{{.Arch}}/gwvault + src: "{{.AssetWithoutExt}}/gwvault" format: tar.gz overrides: - goos: windows From 5e6816d5178e8dd075c4be14d597e94f771357e4 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 8 Oct 2023 21:02:33 +0900 Subject: [PATCH 7/7] refactor: refactor btop --- pkgs/aristocratos/btop/registry.yaml | 6 +++--- registry.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/aristocratos/btop/registry.yaml b/pkgs/aristocratos/btop/registry.yaml index 95762d5c060..f0ebc858986 100644 --- a/pkgs/aristocratos/btop/registry.yaml +++ b/pkgs/aristocratos/btop/registry.yaml @@ -3,8 +3,8 @@ packages: repo_owner: aristocratos repo_name: btop description: A monitor of resources - asset: btop-{{.Arch}}-{{.OS}}.tbz - format: tar.bz2 + asset: btop-{{.Arch}}-{{.OS}} + format: tbz supported_envs: - darwin - linux @@ -21,7 +21,7 @@ packages: - name: btop src: btop/bin/btop version_overrides: - - version_constraint: "true" + - version_constraint: semver("< 1.2.13") files: - name: btop src: bin/btop diff --git a/registry.yaml b/registry.yaml index 0eb42422286..0c4a85a260d 100644 --- a/registry.yaml +++ b/registry.yaml @@ -4234,8 +4234,8 @@ packages: repo_owner: aristocratos repo_name: btop description: A monitor of resources - asset: btop-{{.Arch}}-{{.OS}}.tbz - format: tar.bz2 + asset: btop-{{.Arch}}-{{.OS}} + format: tbz supported_envs: - darwin - linux @@ -4252,7 +4252,7 @@ packages: - name: btop src: btop/bin/btop version_overrides: - - version_constraint: "true" + - version_constraint: semver("< 1.2.13") files: - name: btop src: bin/btop