From 5c558cb1e9d15cdd64fd39664dd2bc65c73e4b3f Mon Sep 17 00:00:00 2001 From: Cameron Rozean Date: Wed, 13 Sep 2023 15:47:30 -0700 Subject: [PATCH 1/4] format structured readme for go projects --- .../pkg/eksGoRelease/readmeFmt.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt new file mode 100644 index 000000000..0194cd17c --- /dev/null +++ b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt @@ -0,0 +1,18 @@ +# EKS Golang %s + +Current Release: `%d` + +Tracking Tag: `%s` + +Artifacts: https://distro.eks.amazonaws.com/golang-go%s/releases/%d/RPMS + +### ARM64 Builds +[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%s-ARM64-PROD-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) + +### AMD64 Builds\n[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%s-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) + +### Patches +The patches in `./patches` include relevant utility fixes for go `%s`. + +### Spec +The RPM spec file in `./rpmbuild/SPECS` is sourced from the go %s SRPM available on Fedora, and modified to include the relevant patches and build the `%s` source." From 37358632eb0eaa75ebd490376dfceaa6fd48d677 Mon Sep 17 00:00:00 2001 From: Cameron Rozean Date: Thu, 14 Sep 2023 11:06:00 -0700 Subject: [PATCH 2/4] update readme fmt --- .../pkg/eksGoRelease/readmeFmt.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt index 0194cd17c..d1233abcc 100644 --- a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt +++ b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt @@ -4,12 +4,13 @@ Current Release: `%d` Tracking Tag: `%s` -Artifacts: https://distro.eks.amazonaws.com/golang-go%s/releases/%d/RPMS +Artifacts: %s ### ARM64 Builds -[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%s-ARM64-PROD-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) +[![Build status](%s)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) -### AMD64 Builds\n[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%s-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) +### AMD64 Builds +[![Build status](%s)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) ### Patches The patches in `./patches` include relevant utility fixes for go `%s`. From 20f3b06bb912821fb0898ba4ba34775ecad02d83 Mon Sep 17 00:00:00 2001 From: Cameron Rozean Date: Thu, 14 Sep 2023 15:12:06 -0700 Subject: [PATCH 3/4] Update readmeFmt.txt Allow for testing --- .../pkg/eksGoRelease/readmeFmt.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt index d1233abcc..2bc3d5a4b 100644 --- a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt +++ b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt @@ -2,9 +2,12 @@ Current Release: `%d` -Tracking Tag: `%s` +Tracking Tag: `go%s` -Artifacts: %s +### Artifacts: +|Arch|Artifact|sha| +|:---:|:---:|:---:| +%s ### ARM64 Builds [![Build status](%s)](https://prow.eks.amazonaws.com/?repo=aws%%2Feks-distro-build-tooling&type=postsubmit) @@ -16,4 +19,4 @@ Artifacts: %s The patches in `./patches` include relevant utility fixes for go `%s`. ### Spec -The RPM spec file in `./rpmbuild/SPECS` is sourced from the go %s SRPM available on Fedora, and modified to include the relevant patches and build the `%s` source." +The RPM spec file in `./rpmbuild/SPECS` is sourced from the go %s SRPM available on Fedora, and modified to include the relevant patches and build the `go%s` source." From a95a4f11c8fbac8b2c47f30f0eecffad0d8613c8 Mon Sep 17 00:00:00 2001 From: <> Date: Thu, 5 Oct 2023 16:24:43 -0700 Subject: [PATCH 4/4] Init new Go Minor Version 1.21 files. --- projects/golang/go/1.21/GIT_TAG | 2 +- projects/golang/go/1.21/README.md | 23 ++++++++++++------- projects/golang/go/1.21/RELEASE | 2 +- .../golang/go/1.21/rpmbuild/SPECS/golang.spec | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/projects/golang/go/1.21/GIT_TAG b/projects/golang/go/1.21/GIT_TAG index 0c9ce90a1..c348e390e 100644 --- a/projects/golang/go/1.21/GIT_TAG +++ b/projects/golang/go/1.21/GIT_TAG @@ -1 +1 @@ -go1.21.1 +go1.21.2 \ No newline at end of file diff --git a/projects/golang/go/1.21/README.md b/projects/golang/go/1.21/README.md index 6ce8615ba..1ba02d176 100644 --- a/projects/golang/go/1.21/README.md +++ b/projects/golang/go/1.21/README.md @@ -1,20 +1,27 @@ -# EKS Golang 1.21.0 +# EKS Golang 1.21 -Current Release: `1` +Current Release: `2` -Tracking Tag: `go1.21.1` +Tracking Tag: `go1.21.2` + +### Artifacts: +|Arch|Artifact|sha| +|:---:|:---:|:---:| +|noarch|[golang-1.21.2-2.amzn2.eks.noarch.rpm](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/x86_64/RPMS/noarch/golang-1.21.2-2.amzn2.eks.noarch.rpm)|[golang-1.21.2-2.amzn2.eks.noarch.rpm.sha256](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/x86_64/RPMS/noarch/golang-1.21.2-2.amzn2.eks.noarch.rpm.sha256)| +|x86_64|[golang-1.21.2-2.amzn2.eks.x86_64.rpm](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/x86_64/RPMS/x86_64/golang-1.21.2-2.amzn2.eks.x86_64.rpm)|[golang-1.21.2-2.amzn2.eks.x86_64.rpm.sha256](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/x86_64/RPMS/x86_64/golang-1.21.2-2.amzn2.eks.x86_64.rpm.sha256)| +|aarch64|[golang-1.21.2-2.amzn2.eks.aarch64.rpm](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/aarch64/RPMS/aarch64/golang-1.21.2-2.amzn2.eks.aarch64.rpm)|[golang-1.21.2-2.amzn2.eks.aarch64.rpm.sha256](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/aarch64/RPMS/aarch64/golang-1.21.2-2.amzn2.eks.aarch64.rpm.sha256)| +|arm64|[go1.21.2.linux-arm64.tar.gz](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/archives/linux/arm64/go1.21.2.linux-arm64.tar.gz)|[go1.21.2.linux-arm64.tar.gz.sha256](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/archives/linux/arm64/go1.21.2.linux-arm64.tar.gz.sha256)| +|amd64|[go1.21.2.linux-amd64.tar.gz](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/archives/linux/amd64/go1.21.2.linux-amd64.tar.gz)|[go1.21.2.linux-amd64.tar.gz.sha256](https://distro.eks.amazonaws.com/golang-go1.21.2/release/2/archives/linux/amd64/go1.21.2.linux-amd64.tar.gz.sha256)| -Artifacts: https://distro.eks.amazonaws.com/golang-go1.21/releases/1/RPMS ### ARM64 Builds -[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-1.21-ARM64-PROD-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%2Feks-distro-build-tooling&type=postsubmit) +[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-1-21-ARM64-PROD-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%2Feks-distro-build-tooling&type=postsubmit) ### AMD64 Builds -[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-1.21-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%2Feks-distro-build-tooling&type=postsubmit) +[![Build status](https://prow.eks.amazonaws.com/badge.svg?jobs=golang-1-21-tooling-postsubmit)](https://prow.eks.amazonaws.com/?repo=aws%2Feks-distro-build-tooling&type=postsubmit) ### Patches The patches in `./patches` include relevant utility fixes for go `1.21`. ### Spec -The RPM spec file in `./rpmbuild/SPECS` is sourced from the go 1.21.0 SRPM available on Fedora, and modified to include the relevant patches and build the `1.21.0` source. - +The RPM spec file in `./rpmbuild/SPECS` is sourced from the go 1.21 SRPM available on Fedora, and modified to include the relevant patches and build the `go1.21` source." diff --git a/projects/golang/go/1.21/RELEASE b/projects/golang/go/1.21/RELEASE index d00491fd7..d8263ee98 100644 --- a/projects/golang/go/1.21/RELEASE +++ b/projects/golang/go/1.21/RELEASE @@ -1 +1 @@ -1 +2 \ No newline at end of file diff --git a/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec b/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec index ba3f5142f..6c0ae8c3e 100644 --- a/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec +++ b/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec @@ -97,7 +97,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.21 #global go_prerelease rc3 -%global go_patch 1 +%global go_patch 2 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}