From e527accbe01e167e14acfce018376136726b9aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Apr 2025 09:29:01 +0300 Subject: [PATCH 1/5] refactor(jreleaser/jreleaser): re-scaffold --- pkgs/jreleaser/jreleaser/pkg.yaml | 8 +++ pkgs/jreleaser/jreleaser/registry.yaml | 77 ++++++++++++++++++++++---- pkgs/jreleaser/jreleaser/scaffold.yaml | 5 ++ registry.yaml | 77 ++++++++++++++++++++++---- 4 files changed, 143 insertions(+), 24 deletions(-) create mode 100644 pkgs/jreleaser/jreleaser/scaffold.yaml diff --git a/pkgs/jreleaser/jreleaser/pkg.yaml b/pkgs/jreleaser/jreleaser/pkg.yaml index c17c4b2059c..a5957f991f4 100644 --- a/pkgs/jreleaser/jreleaser/pkg.yaml +++ b/pkgs/jreleaser/jreleaser/pkg.yaml @@ -1,2 +1,10 @@ packages: - name: jreleaser/jreleaser@v1.17.0 + - name: jreleaser/jreleaser + version: v1.16.0 + - name: jreleaser/jreleaser + version: v1.10.0 + - name: jreleaser/jreleaser + version: v1.5.1 + - name: jreleaser/jreleaser + version: v1.2.0 diff --git a/pkgs/jreleaser/jreleaser/registry.yaml b/pkgs/jreleaser/jreleaser/registry.yaml index 59bdb703ee0..fc7125135de 100644 --- a/pkgs/jreleaser/jreleaser/registry.yaml +++ b/pkgs/jreleaser/jreleaser/registry.yaml @@ -1,16 +1,69 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json packages: - - name: jreleaser/jreleaser - type: github_release + - type: github_release repo_owner: jreleaser repo_name: jreleaser - description: Release projects quickly and easily with JReleaser - complete_windows_ext: false - asset: jreleaser-{{trimV .Version}}.zip - files: - - name: jreleaser - src: jreleaser-{{trimV .Version}}/bin/jreleaser - checksum: - type: github_release - asset: jreleaser-{{trimV .Version}}.zip.sha256 - algorithm: sha256 + description: ":rocket: Release projects quickly and easily with JReleaser" + version_filter: not (Version == "early-access") + version_constraint: "false" + version_overrides: + - version_constraint: semver("<= 1.0.0") + no_asset: true + - version_constraint: semver("<= 1.2.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - linux/amd64 + - darwin + - version_constraint: semver("<= 1.5.1") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + windows_arm_emulation: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - darwin + - windows + - amd64 + - version_constraint: semver("<= 1.10.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - linux/amd64 + - darwin + - version_constraint: semver("<= 1.16.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + windows_arm_emulation: true + replacements: + amd64: x86_64 + darwin: osx + overrides: + - goos: darwin + replacements: + arm64: aarch64 + supported_envs: + - darwin + - windows + - amd64 + - version_constraint: "true" + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + windows_arm_emulation: true + replacements: + amd64: x86_64 + arm64: aarch64 + darwin: osx + overrides: + - goos: windows + replacements: {} diff --git a/pkgs/jreleaser/jreleaser/scaffold.yaml b/pkgs/jreleaser/jreleaser/scaffold.yaml new file mode 100644 index 00000000000..56924465b36 --- /dev/null +++ b/pkgs/jreleaser/jreleaser/scaffold.yaml @@ -0,0 +1,5 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-generate-registry.json +name: jreleaser/jreleaser +all_assets_filter: Asset matches "^jreleaser-native-" +version_filter: not (Version == "early-access") diff --git a/registry.yaml b/registry.yaml index 176ab4663af..abb3d78ffc5 100644 --- a/registry.yaml +++ b/registry.yaml @@ -34331,20 +34331,73 @@ packages: type: github_release asset: checksums.txt algorithm: sha256 - - name: jreleaser/jreleaser - type: github_release + - type: github_release repo_owner: jreleaser repo_name: jreleaser - description: Release projects quickly and easily with JReleaser - complete_windows_ext: false - asset: jreleaser-{{trimV .Version}}.zip - files: - - name: jreleaser - src: jreleaser-{{trimV .Version}}/bin/jreleaser - checksum: - type: github_release - asset: jreleaser-{{trimV .Version}}.zip.sha256 - algorithm: sha256 + description: ":rocket: Release projects quickly and easily with JReleaser" + version_filter: not (Version == "early-access") + version_constraint: "false" + version_overrides: + - version_constraint: semver("<= 1.0.0") + no_asset: true + - version_constraint: semver("<= 1.2.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - linux/amd64 + - darwin + - version_constraint: semver("<= 1.5.1") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + windows_arm_emulation: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - darwin + - windows + - amd64 + - version_constraint: semver("<= 1.10.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + rosetta2: true + replacements: + amd64: x86_64 + darwin: osx + supported_envs: + - linux/amd64 + - darwin + - version_constraint: semver("<= 1.16.0") + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + windows_arm_emulation: true + replacements: + amd64: x86_64 + darwin: osx + overrides: + - goos: darwin + replacements: + arm64: aarch64 + supported_envs: + - darwin + - windows + - amd64 + - version_constraint: "true" + asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} + format: zip + windows_arm_emulation: true + replacements: + amd64: x86_64 + arm64: aarch64 + darwin: osx + overrides: + - goos: windows + replacements: {} - name: jreleaser/jreleaser/standalone type: github_release repo_owner: jreleaser From a313898a36b211ee4c0cf42612e10e92422f2ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Apr 2025 11:29:12 +0300 Subject: [PATCH 2/5] fix(jreleaser/jreleaser): files --- pkgs/jreleaser/jreleaser/registry.yaml | 2 ++ registry.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/jreleaser/jreleaser/registry.yaml b/pkgs/jreleaser/jreleaser/registry.yaml index fc7125135de..ce72d1e1c26 100644 --- a/pkgs/jreleaser/jreleaser/registry.yaml +++ b/pkgs/jreleaser/jreleaser/registry.yaml @@ -4,6 +4,8 @@ packages: repo_owner: jreleaser repo_name: jreleaser description: ":rocket: Release projects quickly and easily with JReleaser" + files: + - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser version_filter: not (Version == "early-access") version_constraint: "false" version_overrides: diff --git a/registry.yaml b/registry.yaml index abb3d78ffc5..be454a921c8 100644 --- a/registry.yaml +++ b/registry.yaml @@ -34335,6 +34335,8 @@ packages: repo_owner: jreleaser repo_name: jreleaser description: ":rocket: Release projects quickly and easily with JReleaser" + files: + - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser version_filter: not (Version == "early-access") version_constraint: "false" version_overrides: From 406c851ffabf925aded705911cae5d4205c2a5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Apr 2025 11:33:38 +0300 Subject: [PATCH 3/5] feat(jreleaser/jreleaser): SLSA provenance config --- pkgs/jreleaser/jreleaser/registry.yaml | 4 ++++ registry.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/jreleaser/jreleaser/registry.yaml b/pkgs/jreleaser/jreleaser/registry.yaml index ce72d1e1c26..d33087a0fe3 100644 --- a/pkgs/jreleaser/jreleaser/registry.yaml +++ b/pkgs/jreleaser/jreleaser/registry.yaml @@ -69,3 +69,7 @@ packages: overrides: - goos: windows replacements: {} + slsa_provenance: + type: github_release + asset: jreleaser-all-{{trimV .Version}}.intoto.jsonl + source_tag: "-" diff --git a/registry.yaml b/registry.yaml index be454a921c8..213c483c21d 100644 --- a/registry.yaml +++ b/registry.yaml @@ -34400,6 +34400,10 @@ packages: overrides: - goos: windows replacements: {} + slsa_provenance: + type: github_release + asset: jreleaser-all-{{trimV .Version}}.intoto.jsonl + source_tag: "-" - name: jreleaser/jreleaser/standalone type: github_release repo_owner: jreleaser From 7e7bd7ffc8f2aa93e7edcf1826aed0949fa7252e Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 7 Apr 2025 06:31:32 +0900 Subject: [PATCH 4/5] fix(jreleaser/jreleaser): fix `files` --- pkgs/jreleaser/jreleaser/registry.yaml | 17 +++++++++++++++-- registry.yaml | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/jreleaser/jreleaser/registry.yaml b/pkgs/jreleaser/jreleaser/registry.yaml index d33087a0fe3..d942c047d7f 100644 --- a/pkgs/jreleaser/jreleaser/registry.yaml +++ b/pkgs/jreleaser/jreleaser/registry.yaml @@ -4,8 +4,6 @@ packages: repo_owner: jreleaser repo_name: jreleaser description: ":rocket: Release projects quickly and easily with JReleaser" - files: - - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser version_filter: not (Version == "early-access") version_constraint: "false" version_overrides: @@ -15,6 +13,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip rosetta2: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -26,6 +27,9 @@ packages: format: zip rosetta2: true windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -37,6 +41,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip rosetta2: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -47,6 +54,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -62,6 +72,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 arm64: aarch64 diff --git a/registry.yaml b/registry.yaml index 213c483c21d..e0cdad19b41 100644 --- a/registry.yaml +++ b/registry.yaml @@ -34335,8 +34335,6 @@ packages: repo_owner: jreleaser repo_name: jreleaser description: ":rocket: Release projects quickly and easily with JReleaser" - files: - - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser version_filter: not (Version == "early-access") version_constraint: "false" version_overrides: @@ -34346,6 +34344,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip rosetta2: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -34357,6 +34358,9 @@ packages: format: zip rosetta2: true windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -34368,6 +34372,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip rosetta2: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -34378,6 +34385,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 darwin: osx @@ -34393,6 +34403,9 @@ packages: asset: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}.{{.Format}} format: zip windows_arm_emulation: true + files: + - name: jreleaser + src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser replacements: amd64: x86_64 arm64: aarch64 From e5a279288ac002398884095ca189cefc222d619c Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 7 Apr 2025 06:34:31 +0900 Subject: [PATCH 5/5] refactor(jreleaser/jreleaser): use AssetWithoutExt --- pkgs/jreleaser/jreleaser/registry.yaml | 10 +++++----- registry.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/jreleaser/jreleaser/registry.yaml b/pkgs/jreleaser/jreleaser/registry.yaml index d942c047d7f..3de2e33f4e9 100644 --- a/pkgs/jreleaser/jreleaser/registry.yaml +++ b/pkgs/jreleaser/jreleaser/registry.yaml @@ -15,7 +15,7 @@ packages: rosetta2: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -29,7 +29,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -43,7 +43,7 @@ packages: rosetta2: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -56,7 +56,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -74,7 +74,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 arm64: aarch64 diff --git a/registry.yaml b/registry.yaml index e0cdad19b41..cd9a5440dd3 100644 --- a/registry.yaml +++ b/registry.yaml @@ -34346,7 +34346,7 @@ packages: rosetta2: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -34360,7 +34360,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -34374,7 +34374,7 @@ packages: rosetta2: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -34387,7 +34387,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 darwin: osx @@ -34405,7 +34405,7 @@ packages: windows_arm_emulation: true files: - name: jreleaser - src: jreleaser-native-{{trimV .Version}}-{{.OS}}-{{.Arch}}/bin/jreleaser + src: "{{.AssetWithoutExt}}/bin/jreleaser" replacements: amd64: x86_64 arm64: aarch64