From 9c00034a824558b2c636dd1f9c901ab6da02aa5c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:11:34 +0200 Subject: [PATCH] [1.19](backport #304) docs: remove windows 32 references (#305) Co-authored-by: Victor Martinez --- .github/release-drafter.yml | 14 +++++++------- README.md | 38 +++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index f86edca9..9361f77e 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -49,13 +49,13 @@ template: | - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-armhf-debian12` - linux/armv7 - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-base` - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14) - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64 - - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian12` - linux/i386, linux/amd64, windows/386, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian7` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian8` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian9` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian10` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian11` - linux/i386, linux/amd64, windows/amd64 + - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian12` - linux/i386, linux/amd64, windows/amd64 - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-mips-debian11` - linux/mips64, linux/mips64el - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-mips-debian12` - linux/mips64, linux/mips64el - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-ppc-debian11` - linux/ppc64, linux/ppc64le diff --git a/README.md b/README.md index 45812574..5e661aa3 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ The `armel`, `mips`, `ppc` and `s390x` platforms are only supported from `Debian `mips32` is not available in `Debian 11`. +`windows/386` is not supported from Golang versions `1.19`/`1.20` onwards, even though if docker images are available. + ## Docker Repo `docker.elastic.co/beats-dev/golang-crossbuild:[TAG]` @@ -27,13 +29,13 @@ Replace `` with the version you would like to use, for instance: - `docker.elastic.co/beats-dev/golang-crossbuild:-armhf` - linux/armv7 - `docker.elastic.co/beats-dev/golang-crossbuild:-base` - `docker.elastic.co/beats-dev/golang-crossbuild:-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14) -- `docker.elastic.co/beats-dev/golang-crossbuild:-main` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64 -- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian12` - linux/i386, linux/amd64, windows/386, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian7` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian8` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian9` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian10` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian11` - linux/i386, linux/amd64, windows/amd64 +- `docker.elastic.co/beats-dev/golang-crossbuild:-main-debian12` - linux/i386, linux/amd64, windows/amd64 - `docker.elastic.co/beats-dev/golang-crossbuild:-mips-debian11` - linux/mips64, linux/mips64el - `docker.elastic.co/beats-dev/golang-crossbuild:-mips-debian12` - linux/mips64, linux/mips64el - `docker.elastic.co/beats-dev/golang-crossbuild:-mips32` - linux/mips, linux/mipsle **NOTE**: it does not exist from Golang versions > `1.18.5`/`1.17.12`. @@ -42,11 +44,13 @@ Replace `` with the version you would like to use, for instance: - `docker.elastic.co/beats-dev/golang-crossbuild:-s390x-debian11` - linux/s390x - `docker.elastic.co/beats-dev/golang-crossbuild:-s390x-debian12` - linux/s390x -**Debian7** uses `glibc 2.13` so the resulting binaries (if dynamically linked) have greater compatibility. -**Debian8** uses `glibc 2.19`. -**Debian9** uses `glibc 2.24`. -**Debian10** uses `glibc 2.28`. -**Debian11** uses `glibc 2.31`. +### glibc + +* **Debian7** uses `glibc 2.13` so the resulting binaries (if dynamically linked) have greater compatibility. +* **Debian8** uses `glibc 2.19`. +* **Debian9** uses `glibc 2.24`. +* **Debian10** uses `glibc 2.28`. +* **Debian11** uses `glibc 2.31`. ## Old Build Tags @@ -72,10 +76,12 @@ Until Golang version 1.15 | linux/{amd64,386} and windows/{amd64,386} (Debian 10 (see **below**)) | NA | NA | NA | NA | NA | `1.15.14-main-debian10` | | linux/arm64 (Debian 9 (see **below**)) | NA | NA | NA | NA | NA | `1.15.14-base-arm-debian9` | -**Debian7** uses `glibc 2.13` so the resulting binaries (if dynamically linked) have greater compatibility. -**Debian8** uses `glibc 2.19`. -**Debian9** uses `glibc 2.24`. -**Debian10** uses `glibc 2.28`. +### glibc + +* **Debian7** uses `glibc 2.13` so the resulting binaries (if dynamically linked) have greater compatibility. +* **Debian8** uses `glibc 2.19`. +* **Debian9** uses `glibc 2.24`. +* **Debian10** uses `glibc 2.28`. ## Usage Example