Skip to content

Commit

Permalink
charconv not found debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
Water-Melon committed Sep 9, 2024
1 parent ad3e19a commit c58926f
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 11 deletions.
127 changes: 121 additions & 6 deletions .github/matrix-commitly.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,139 @@
# please see matrix-full.yml for meaning of each field
build-packages:
- label: ubuntu-22.04
image: ubuntu:22.04
package: deb
check-manifest-suite: ubuntu-22.04-amd64
# label: used to distinguish artifacts for later use
# image: docker image name if the build is running in side a container
# package: package type
# package-type: the nfpm packaging target, //:kong_{package} target; only used when package is rpm
# bazel-args: additional bazel build flags
# check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py

# Ubuntu
# Amazon Linux
- label: amazonlinux-2
package: rpm
package-type: aws2
check-manifest-suite: amazonlinux-2-amd64
# simdjson doesn't compile on gcc7.3.1 (needs 7.4)
bazel-args: --platforms=//:aws2-crossbuild-x86_64 --//:simdjson=False

build-images:
# Only build images for the latest version of each major release.

# label: used as compose docker image label ${github.sha}-${label}
# base-image: docker image to use as base
# package: package type
# artifact-from: label of build-packages to use
# artifact-from-alt: another label of build-packages to use for downloading package (to build multi-arch image)
# docker-platforms: comma separated list of docker buildx platforms to build for

# Ubuntu
- label: ubuntu
base-image: ubuntu:22.04
package: deb
artifact-from: ubuntu-22.04
artifact-from-alt: ubuntu-22.04-arm64
docker-platforms: linux/amd64, linux/arm64

# Debian
- label: debian
base-image: debian:12-slim
package: deb
artifact-from: debian-12

# RHEL
- label: rhel
base-image: registry.access.redhat.com/ubi9
package: rpm
rpm_platform: el9
artifact-from: rhel-9
artifact-from-alt: rhel-9-arm64
docker-platforms: linux/amd64, linux/arm64

smoke-tests:
- label: ubuntu
- label: debian
- label: rhel

scan-vulnerabilities:
- label: ubuntu
- label: debian
- label: rhel

release-packages:
# Ubuntu
- label: ubuntu-20.04
package: deb
artifact-from: ubuntu-20.04
artifact-version: 20.04
artifact-type: ubuntu
artifact: kong.amd64.deb
- label: ubuntu-22.04
package: deb
artifact-from: ubuntu-22.04
artifact-version: 22.04
artifact-type: ubuntu
artifact: kong.amd64.deb
- label: ubuntu-22.04-arm64
package: deb
artifact-from: ubuntu-22.04-arm64
artifact-version: 22.04
artifact-type: ubuntu
artifact: kong.arm64.deb

# Debian
- label: debian-11
package: deb
artifact-from: debian-11
artifact-version: 11
artifact-type: debian
artifact: kong.amd64.deb
- label: debian-12
package: deb
artifact-from: debian-12
artifact-version: 12
artifact-type: debian
artifact: kong.amd64.deb

# RHEL
- label: rhel-8
package: rpm
artifact-from: rhel-8
artifact-version: 8
artifact-type: rhel
artifact: kong.el8.amd64.rpm
- label: rhel-9
package: rpm
artifact-from: rhel-9
artifact-version: 9
artifact-type: rhel
artifact: kong.el9.amd64.rpm
- label: rhel-9-arm64
package: rpm
artifact-from: rhel-9-arm64
artifact-version: 9
artifact-type: rhel
artifact: kong.el9.arm64.rpm

# Amazon Linux
- label: amazonlinux-2
package: rpm
artifact-from: amazonlinux-2
artifact-version: 2
artifact-type: amazonlinux
artifact: kong.aws2.amd64.rpm
- label: amazonlinux-2023
package: rpm
artifact-from: amazonlinux-2023
artifact-version: 2023
artifact-type: amazonlinux
artifact: kong.aws2023.amd64.rpm
- label: amazonlinux-2023-arm64
package: rpm
artifact-from: amazonlinux-2023-arm64
artifact-version: 2023
artifact-type: amazonlinux
artifact: kong.aws2023.arm64.rpm

release-images:
- label: ubuntu
package: deb
- label: debian
- label: rhel
4 changes: 2 additions & 2 deletions build/toolchain/managed_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ aarch64_glibc_distros = {
"rhel9": "11",
"rhel8": "8",
"aws2023": "11",
"aws2": "7",
"aws2": "8",
}

def define_managed_toolchain(
Expand Down Expand Up @@ -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",
)
Expand Down
6 changes: 3 additions & 3 deletions build/toolchain/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def toolchain_repositories():
)

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 = "http://melonc.io/x86_64-aws2-linux-gnu-glibc-2.28-gcc-8.tar.gz",
strip_prefix = "x86_64-aws2-linux-gnu",
type = "tar.gz",
build_file_content = build_file_content,
)

0 comments on commit c58926f

Please sign in to comment.