From e62d242ef768fcc5cb606d304215e2b112b56101 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Sat, 20 Jan 2024 06:33:58 +0700 Subject: [PATCH 1/7] rebase Signed-off-by: Tuan Anh Tran --- aws-cli-v1.yaml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ aws-cli.yaml | 47 ++++++++++++++++++++++++++------------------- 2 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 aws-cli-v1.yaml diff --git a/aws-cli-v1.yaml b/aws-cli-v1.yaml new file mode 100644 index 00000000000..06e840779bf --- /dev/null +++ b/aws-cli-v1.yaml @@ -0,0 +1,51 @@ +package: + name: aws-cli-v1 + version: 1.32.16 + epoch: 0 + description: "Universal Command Line Interface for Amazon Web Services" + copyright: + - license: Apache-2.0 + dependencies: + runtime: + - groff + - py3-botocore + - py3-colorama + - py3-docutils + - py3-jmespath + - py3-rsa + - py3-s3transfer + - py3-setuptools + - py3-yaml + - python3 + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - py3-setuptools + - python3 + - python3-dev + - wolfi-base + +pipeline: + - uses: fetch + with: + uri: https://github.com/aws/aws-cli/archive/${{package.version}}.tar.gz + expected-sha256: 45e474bbafc29f80203ece68d9eb21ef60aec0125b60a45610c4542ef2b8a897 + + - runs: | + python3 setup.py build + + - runs: | + python3 setup.py install --prefix=/usr --root="${{targets.destdir}}" + + - uses: strip + +update: + enabled: true + github: + identifier: aws/aws-cli + use-tag: true + tag-filter: "1." diff --git a/aws-cli.yaml b/aws-cli.yaml index ad232138bf6..2bbb6ee97d3 100644 --- a/aws-cli.yaml +++ b/aws-cli.yaml @@ -1,22 +1,15 @@ +# awscli use these documentation files (*.rst) in aws help command +#nolint:documentation package: name: aws-cli - version: 1.32.23 + version: 2.15.9 epoch: 0 - description: "Universal Command Line Interface for Amazon Web Services" + description: "Universal Command Line Interface for Amazon Web Services (v2)" copyright: - license: Apache-2.0 dependencies: runtime: - groff - - py3-botocore - - py3-colorama - - py3-docutils - - py3-jmespath - - py3-rsa - - py3-s3transfer - - py3-setuptools - - py3-yaml - - python3 environment: contents: @@ -24,22 +17,36 @@ environment: - build-base - busybox - ca-certificates-bundle - - py3-setuptools - - python3 - - python3-dev + - posix-libc-utils # need ldd + - python-3.11 + - python-3.11-dev - wolfi-base pipeline: - - uses: fetch + - uses: git-checkout with: - uri: https://github.com/aws/aws-cli/archive/${{package.version}}.tar.gz - expected-sha256: 300ac3cb29de0b5bdeedb0173efa5002aace73cd27f1811c602501849a79e0d5 + repository: https://github.com/aws/aws-cli + expected-commit: 862fa3643d49ce21d4360ea0593a8ce7582f6533 + tag: ${{package.version}} - runs: | - python3 setup.py build + ./configure \ + --prefix=/usr/ \ + --with-install-type=portable-exe \ + --with-download-deps + - uses: autoconf/make + + - uses: autoconf/make-install + + # manually fix the symlinks, waiting for upstream fix + # ref: https://github.com/aws/aws-cli/issues/8467 - runs: | - python3 setup.py install --prefix=/usr --root="${{targets.destdir}}" + rm ${{targets.destdir}}/usr/bin/aws + rm ${{targets.destdir}}/usr/bin/aws_completer + + ln -s /usr/lib/aws-cli/aws ${{targets.destdir}}/usr/bin/aws + ln -s /usr/lib/aws-cli/aws_completer ${{targets.destdir}}/usr/bin/aws_completer - uses: strip @@ -48,4 +55,4 @@ update: github: identifier: aws/aws-cli use-tag: true - tag-filter: "1." + tag-filter: "2." From b4c2c046a101ec92fb1b32adefdb7491ce533c54 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Sat, 20 Jan 2024 06:32:21 +0700 Subject: [PATCH 2/7] bump to 2.15.11 Signed-off-by: Tuan Anh Tran --- aws-cli.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli.yaml b/aws-cli.yaml index 2bbb6ee97d3..06c592e944f 100644 --- a/aws-cli.yaml +++ b/aws-cli.yaml @@ -2,7 +2,7 @@ #nolint:documentation package: name: aws-cli - version: 2.15.9 + version: 2.15.11 epoch: 0 description: "Universal Command Line Interface for Amazon Web Services (v2)" copyright: @@ -26,7 +26,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/aws/aws-cli - expected-commit: 862fa3643d49ce21d4360ea0593a8ce7582f6533 + expected-commit: 63762709f69e8861c709d5c85f2116127b5cf938 tag: ${{package.version}} - runs: | From e8606b1ab5490a7517aaf67782a6d200eeedee81 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Tue, 12 Mar 2024 15:32:55 +0700 Subject: [PATCH 3/7] create new package with v2, leaving awscli v1 as is Signed-off-by: Tuan Anh Tran --- aws-cli-v1.yaml | 51 ------------------------------------------- aws-cli-v2.yaml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ aws-cli.yaml | 47 +++++++++++++++++---------------------- 3 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 aws-cli-v1.yaml create mode 100644 aws-cli-v2.yaml diff --git a/aws-cli-v1.yaml b/aws-cli-v1.yaml deleted file mode 100644 index 06e840779bf..00000000000 --- a/aws-cli-v1.yaml +++ /dev/null @@ -1,51 +0,0 @@ -package: - name: aws-cli-v1 - version: 1.32.16 - epoch: 0 - description: "Universal Command Line Interface for Amazon Web Services" - copyright: - - license: Apache-2.0 - dependencies: - runtime: - - groff - - py3-botocore - - py3-colorama - - py3-docutils - - py3-jmespath - - py3-rsa - - py3-s3transfer - - py3-setuptools - - py3-yaml - - python3 - -environment: - contents: - packages: - - build-base - - busybox - - ca-certificates-bundle - - py3-setuptools - - python3 - - python3-dev - - wolfi-base - -pipeline: - - uses: fetch - with: - uri: https://github.com/aws/aws-cli/archive/${{package.version}}.tar.gz - expected-sha256: 45e474bbafc29f80203ece68d9eb21ef60aec0125b60a45610c4542ef2b8a897 - - - runs: | - python3 setup.py build - - - runs: | - python3 setup.py install --prefix=/usr --root="${{targets.destdir}}" - - - uses: strip - -update: - enabled: true - github: - identifier: aws/aws-cli - use-tag: true - tag-filter: "1." diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml new file mode 100644 index 00000000000..7fcaad581d5 --- /dev/null +++ b/aws-cli-v2.yaml @@ -0,0 +1,58 @@ +# awscli use these documentation files (*.rst) in aws help command +#nolint:documentation +package: + name: aws-cli-v2 + version: 2.15.11 + epoch: 0 + description: "Universal Command Line Interface for Amazon Web Services (v2)" + copyright: + - license: Apache-2.0 + dependencies: + runtime: + - groff + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - posix-libc-utils # need ldd + - python-3.11 + - python-3.11-dev + - wolfi-base + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/aws/aws-cli + expected-commit: 63762709f69e8861c709d5c85f2116127b5cf938 + tag: ${{package.version}} + + - runs: | + ./configure \ + --prefix=/usr/ \ + --with-install-type=portable-exe \ + --with-download-deps + + - uses: autoconf/make + + - uses: autoconf/make-install + + # manually fix the symlinks, waiting for upstream fix + # ref: https://github.com/aws/aws-cli/issues/8467 + - runs: | + rm ${{targets.destdir}}/usr/bin/aws + rm ${{targets.destdir}}/usr/bin/aws_completer + + ln -s /usr/lib/aws-cli/aws ${{targets.destdir}}/usr/bin/aws + ln -s /usr/lib/aws-cli/aws_completer ${{targets.destdir}}/usr/bin/aws_completer + + - uses: strip + +update: + enabled: true + github: + identifier: aws/aws-cli + use-tag: true + tag-filter: "2." \ No newline at end of file diff --git a/aws-cli.yaml b/aws-cli.yaml index 06c592e944f..c5a9b264303 100644 --- a/aws-cli.yaml +++ b/aws-cli.yaml @@ -1,15 +1,22 @@ -# awscli use these documentation files (*.rst) in aws help command -#nolint:documentation package: name: aws-cli - version: 2.15.11 + version: 1.32.60 epoch: 0 - description: "Universal Command Line Interface for Amazon Web Services (v2)" + description: "Universal Command Line Interface for Amazon Web Services" copyright: - license: Apache-2.0 dependencies: runtime: - groff + - py3-botocore + - py3-colorama + - py3-docutils + - py3-jmespath + - py3-rsa + - py3-s3transfer + - py3-setuptools + - py3-yaml + - python3 environment: contents: @@ -17,36 +24,22 @@ environment: - build-base - busybox - ca-certificates-bundle - - posix-libc-utils # need ldd - - python-3.11 - - python-3.11-dev + - py3-setuptools + - python3 + - python3-dev - wolfi-base pipeline: - - uses: git-checkout + - uses: fetch with: - repository: https://github.com/aws/aws-cli - expected-commit: 63762709f69e8861c709d5c85f2116127b5cf938 - tag: ${{package.version}} + uri: https://github.com/aws/aws-cli/archive/${{package.version}}.tar.gz + expected-sha256: ea07b44b87d7e0aa20bb899a06b09927fb5410adb819ac48f3c248fb3230a9ab - runs: | - ./configure \ - --prefix=/usr/ \ - --with-install-type=portable-exe \ - --with-download-deps + python3 setup.py build - - uses: autoconf/make - - - uses: autoconf/make-install - - # manually fix the symlinks, waiting for upstream fix - # ref: https://github.com/aws/aws-cli/issues/8467 - runs: | - rm ${{targets.destdir}}/usr/bin/aws - rm ${{targets.destdir}}/usr/bin/aws_completer - - ln -s /usr/lib/aws-cli/aws ${{targets.destdir}}/usr/bin/aws - ln -s /usr/lib/aws-cli/aws_completer ${{targets.destdir}}/usr/bin/aws_completer + python3 setup.py install --prefix=/usr --root="${{targets.destdir}}" --skip-build - uses: strip @@ -55,4 +48,4 @@ update: github: identifier: aws/aws-cli use-tag: true - tag-filter: "2." + tag-filter: "1." \ No newline at end of file From f8dee9dd098cfae62fb9ec8f720a0154b0c4a552 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Tue, 12 Mar 2024 15:45:31 +0700 Subject: [PATCH 4/7] bump aws-cli-v2 to latest version --- aws-cli-v2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml index 7fcaad581d5..d6e68caa627 100644 --- a/aws-cli-v2.yaml +++ b/aws-cli-v2.yaml @@ -2,7 +2,7 @@ #nolint:documentation package: name: aws-cli-v2 - version: 2.15.11 + version: 2.15.28 epoch: 0 description: "Universal Command Line Interface for Amazon Web Services (v2)" copyright: @@ -26,7 +26,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/aws/aws-cli - expected-commit: 63762709f69e8861c709d5c85f2116127b5cf938 + expected-commit: f522b17ce9fc3a92ae6cc3fa8710114007527c5d tag: ${{package.version}} - runs: | From 90d89543752b733116739cd3e5807d594e981736 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Thu, 21 Mar 2024 21:22:18 +0700 Subject: [PATCH 5/7] fix lint Signed-off-by: Tuan Anh Tran --- aws-cli-v2.yaml | 2 +- aws-cli.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml index d6e68caa627..9c88c15834f 100644 --- a/aws-cli-v2.yaml +++ b/aws-cli-v2.yaml @@ -55,4 +55,4 @@ update: github: identifier: aws/aws-cli use-tag: true - tag-filter: "2." \ No newline at end of file + tag-filter: "2." diff --git a/aws-cli.yaml b/aws-cli.yaml index c5a9b264303..afbd6de4f70 100644 --- a/aws-cli.yaml +++ b/aws-cli.yaml @@ -48,4 +48,4 @@ update: github: identifier: aws/aws-cli use-tag: true - tag-filter: "1." \ No newline at end of file + tag-filter: "1." From 3b5383d7cf0be902ca64b65b6060f9ff4c210e84 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Thu, 21 Mar 2024 21:29:53 +0700 Subject: [PATCH 6/7] bump version Signed-off-by: Tuan Anh Tran --- aws-cli-v2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml index 9c88c15834f..34761e1fafe 100644 --- a/aws-cli-v2.yaml +++ b/aws-cli-v2.yaml @@ -2,7 +2,7 @@ #nolint:documentation package: name: aws-cli-v2 - version: 2.15.28 + version: 2.15.31 epoch: 0 description: "Universal Command Line Interface for Amazon Web Services (v2)" copyright: @@ -26,7 +26,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/aws/aws-cli - expected-commit: f522b17ce9fc3a92ae6cc3fa8710114007527c5d + expected-commit: fd2e21c0a3637309025813ff5bc9e10c7e8d4c66 tag: ${{package.version}} - runs: | From 5ee9edc15efb116ac03449dd8ea9a2272d8dd487 Mon Sep 17 00:00:00 2001 From: Tuan Anh Tran Date: Sun, 24 Mar 2024 07:19:01 +0700 Subject: [PATCH 7/7] aws-cli-v2: bump version Signed-off-by: Tuan Anh Tran --- aws-cli-v2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml index 34761e1fafe..bdfc1492261 100644 --- a/aws-cli-v2.yaml +++ b/aws-cli-v2.yaml @@ -2,7 +2,7 @@ #nolint:documentation package: name: aws-cli-v2 - version: 2.15.31 + version: 2.15.32 epoch: 0 description: "Universal Command Line Interface for Amazon Web Services (v2)" copyright: @@ -26,7 +26,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/aws/aws-cli - expected-commit: fd2e21c0a3637309025813ff5bc9e10c7e8d4c66 + expected-commit: 8ce449d19a1c9494a95769bdaed1f21adf3d87eb tag: ${{package.version}} - runs: |