From c3a817631bd998ae5ba5e30aef422d25599707a1 Mon Sep 17 00:00:00 2001 From: Water-Melon Date: Tue, 10 Sep 2024 07:40:08 +0000 Subject: [PATCH] chore(bazel): bump crosstool-ng-actions from 0.7.0 to 0.8.0 KAG-5335 --- build/toolchain/managed_toolchain.bzl | 4 ++-- build/toolchain/repositories.bzl | 24 +++++++++---------- .../fixtures/amazonlinux-2-amd64.txt | 2 +- .../fixtures/amazonlinux-2023-arm64.txt | 3 ++- .../explain_manifest/fixtures/el9-arm64.txt | 3 ++- .../fixtures/ubuntu-22.04-arm64.txt | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build/toolchain/managed_toolchain.bzl b/build/toolchain/managed_toolchain.bzl index 7d603ad22b94..ae4d3d507119 100644 --- a/build/toolchain/managed_toolchain.bzl +++ b/build/toolchain/managed_toolchain.bzl @@ -4,7 +4,7 @@ aarch64_glibc_distros = { "rhel9": "11", "rhel8": "8", "aws2023": "11", - "aws2": "7", + "aws2": "8", } def define_managed_toolchain( @@ -78,7 +78,7 @@ def register_all_toolchains(name = None): register_managed_toolchain( arch = "x86_64", - gcc_version = "7", + gcc_version = "8", libc = "gnu", vendor = "aws2", ) diff --git a/build/toolchain/repositories.bzl b/build/toolchain/repositories.bzl index a8a7c0a1b9a3..4a91eb868ff9 100644 --- a/build/toolchain/repositories.bzl +++ b/build/toolchain/repositories.bzl @@ -23,40 +23,40 @@ filegroup( def toolchain_repositories(): http_archive( name = "aarch64-rhel9-linux-gnu-gcc-11", - url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.7.0/aarch64-rhel9-linux-gnu-glibc-2.34-gcc-11.tar.gz", - sha256 = "8db520adb98f43dfe3da5d51e09679b85956e3a11362d7cba37a85065e87fcf7", + url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.8.0/aarch64-rhel9-linux-gnu-glibc-2.34-gcc-11.tar.gz", + sha256 = "b8f9573cb71d5556aea5a0e13c205786b5817f54273e2efcde71548e9eb297a2", strip_prefix = "aarch64-rhel9-linux-gnu", build_file_content = build_file_content, ) http_archive( name = "aarch64-rhel8-linux-gnu-gcc-8", - url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.7.0/aarch64-rhel8-linux-gnu-glibc-2.28-gcc-8.tar.gz", - sha256 = "de41ca31b6a056bddd770b4cb50fe8e8c31e8faa9ce857771ab7410a954d1cbe", + url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.8.0/aarch64-rhel8-linux-gnu-glibc-2.28-gcc-8.tar.gz", + sha256 = "f802d09c54f037f78198ff90bf847d822529ec3c6797a922e282453ad44321ef", strip_prefix = "aarch64-rhel8-linux-gnu", build_file_content = build_file_content, ) http_archive( name = "aarch64-aws2023-linux-gnu-gcc-11", - url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.7.0/aarch64-aws2023-linux-gnu-glibc-2.34-gcc-11.tar.gz", - sha256 = "c0333ba0934b32f59ab9c3076c47785c94413aae264cc2ee78d6d5fd46171a9d", + url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.8.0/aarch64-aws2023-linux-gnu-glibc-2.34-gcc-11.tar.gz", + sha256 = "4b5ef1511035fcb4b95c543485dc7a72675abcb27c4d2b6a20ac4598f2717a9f", strip_prefix = "aarch64-aws2023-linux-gnu", build_file_content = build_file_content, ) http_archive( - name = "aarch64-aws2-linux-gnu-gcc-7", - url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.7.0/aarch64-aws2-linux-gnu-glibc-2.26-gcc-7.tar.gz", - sha256 = "de365a366b5de93b0f6d851746e7ced06946b083b390500d4c1b4a8360702331", + name = "aarch64-aws2-linux-gnu-gcc-8", + url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.8.0/aarch64-aws2-linux-gnu-glibc-2.26-gcc-8.tar.gz", + sha256 = "4bcf3e5448cca6c33f8d6d3e97da0378cfa57b116e5ba6f037e4fd11149ed37f", strip_prefix = "aarch64-aws2-linux-gnu", build_file_content = build_file_content, ) http_archive( - name = "x86_64-aws2-linux-gnu-gcc-7", - url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.7.0/x86_64-aws2-linux-gnu-glibc-2.26-gcc-7.tar.gz", - sha256 = "645c242d13bf456ca59a7e9701e9d2f53336fd0497ccaff2b151da9921469985", + name = "x86_64-aws2-linux-gnu-gcc-8", + url = "https://github.com/Kong/crosstool-ng-actions/releases/download/0.8.0/x86_64-aws2-linux-gnu-glibc-2.26-gcc-8.tar.gz", + sha256 = "bb742616c651900280ac63e926d941fa4bb851e648d011a04a29de62e818e516", strip_prefix = "x86_64-aws2-linux-gnu", build_file_content = build_file_content, ) diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt index f75994009046..b22d4daf4ec4 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt @@ -49,8 +49,8 @@ - Path : /usr/local/kong/lib/libada.so Needed : - - libstdc++.so.6 - libm.so.6 + - libstdc++.so.6 - libgcc_s.so.1 - libc.so.6 diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt index 807cec769697..1a499b6cda55 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt @@ -47,10 +47,11 @@ - Path : /usr/local/kong/lib/libada.so Needed : - - libstdc++.so.6 - libm.so.6 + - libstdc++.so.6 - libgcc_s.so.1 - libc.so.6 + - ld-linux-aarch64.so.1 - Path : /usr/local/kong/lib/libcrypto.so.3 Needed : diff --git a/scripts/explain_manifest/fixtures/el9-arm64.txt b/scripts/explain_manifest/fixtures/el9-arm64.txt index 807cec769697..1a499b6cda55 100644 --- a/scripts/explain_manifest/fixtures/el9-arm64.txt +++ b/scripts/explain_manifest/fixtures/el9-arm64.txt @@ -47,10 +47,11 @@ - Path : /usr/local/kong/lib/libada.so Needed : - - libstdc++.so.6 - libm.so.6 + - libstdc++.so.6 - libgcc_s.so.1 - libc.so.6 + - ld-linux-aarch64.so.1 - Path : /usr/local/kong/lib/libcrypto.so.3 Needed : diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt index cb06affdd985..6b1664c89895 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt @@ -34,9 +34,9 @@ - Path : /usr/local/kong/lib/libada.so Needed : - libstdc++.so.6 - - libm.so.6 - libgcc_s.so.1 - libc.so.6 + - ld-linux-aarch64.so.1 - Path : /usr/local/kong/lib/libcrypto.so.3 Needed :