From c10fa6fd453044e6dc916138fe1a41ec566cc7fe Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:35:32 +0000 Subject: [PATCH 1/7] Update ci/Dockerfile.std --- ci/Dockerfile.std | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index cce463d35..b18d8fe20 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -2,7 +2,7 @@ # Generated by: gromit policy # Generated on: Wed Jul 26 08:25:03 UTC 2023 -FROM debian:bullseye-slim +FROM debian:bullseye-slim-s390x ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -37,4 +37,4 @@ WORKDIR /opt/tyk-pump/ # COPY tyk-pump . ENTRYPOINT ["/opt/tyk-pump/tyk-pump" ] -CMD [ "--conf=/opt/tyk-pump/pump.conf" ] +CMD [ "--conf=/opt/tyk-pump/pump.conf" ] \ No newline at end of file From 5954b5359545caf33c8cce5145f4f37a7cd59742 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:36:14 +0000 Subject: [PATCH 2/7] Update ci/goreleaser/goreleaser.yml --- ci/goreleaser/goreleaser.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index d7666a2b4..ee5fb02ab 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -14,6 +14,7 @@ builds: goarch: - amd64 - arm64 + - s390x binary: tyk-pump dockers: @@ -138,4 +139,4 @@ release: name: tyk-pump prerelease: auto draft: true - name_template: "{{.ProjectName}}-v{{.Version}}" + name_template: "{{.ProjectName}}-v{{.Version}}" \ No newline at end of file From 33ed86dacca55fa3d8b648e7ca13d8b555556993 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:36:30 +0000 Subject: [PATCH 3/7] Update .github/workflows/release.yml --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6509fa51..bd325314b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -199,7 +199,7 @@ jobs: ORG_GH_TOKEN: ${{ secrets.ORG_GH_TOKEN }} - upgrade-deb: + upgrade-deb-s390x: if: startsWith(github.ref, 'refs/tags') services: httpbin.org: @@ -210,8 +210,7 @@ jobs: fail-fast: false matrix: arch: - - amd64 - - arm64 + - s390x distro: - ubuntu:jammy - ubuntu:bionic @@ -334,4 +333,3 @@ jobs: cd - fi done - From 232e26265a6c2e1c4bbbbfab7d7a31a8940f87cb Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:39:51 +0000 Subject: [PATCH 4/7] Update ci/Dockerfile.std --- ci/Dockerfile.std | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index b18d8fe20..81ee22c6e 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -2,7 +2,7 @@ # Generated by: gromit policy # Generated on: Wed Jul 26 08:25:03 UTC 2023 -FROM debian:bullseye-slim-s390x +FROM debian:bullseye-slim ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive From f3157cfdac845ed16e1d49d0345226d296db2983 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:40:02 +0000 Subject: [PATCH 5/7] Update ci/goreleaser/goreleaser.yml --- ci/goreleaser/goreleaser.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index ee5fb02ab..9bbac3d75 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -14,7 +14,6 @@ builds: goarch: - amd64 - arm64 - - s390x binary: tyk-pump dockers: From d859ca3fefe6336f1796229dafefd369c582ea70 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:53:30 +0000 Subject: [PATCH 6/7] Update ci/goreleaser/goreleaser.yml --- ci/goreleaser/goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index 9bbac3d75..ee5fb02ab 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -14,6 +14,7 @@ builds: goarch: - amd64 - arm64 + - s390x binary: tyk-pump dockers: From 35d72c8b7d526aeec96ba8bb426cb5ad123e202d Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:53:48 +0000 Subject: [PATCH 7/7] Update .github/workflows/release.yml --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd325314b..bb111baf4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -216,7 +216,6 @@ jobs: - ubuntu:bionic - ubuntu:focal - debian:bullseye - steps: - uses: actions/checkout@v3 with: @@ -332,4 +331,4 @@ jobs: ./test.sh ${{ needs.goreleaser.outputs.tag }} cd - fi - done + done \ No newline at end of file