From 3232160320d2002a3e4c4c0df3f12eaff9039ec4 Mon Sep 17 00:00:00 2001 From: yseto Date: Thu, 6 Jun 2024 17:09:21 +0900 Subject: [PATCH 1/3] replace mackerel/docker-mackerel-rpm-builder:u8 --- .github/workflows/go.yml | 2 +- Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index bfd3e9e99..3b1b7ceb8 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v4 - name: Install debian packaging utils, binutils run: sudo apt-get update && sudo apt-get install -y devscripts debhelper fakeroot binutils-mips-linux-gnu binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf - - run: docker pull mackerel/docker-mackerel-rpm-builder:c7 + - run: docker pull mackerel/docker-mackerel-rpm-builder:u8 - run: make rpm deb rpm-kcps deb-kcps rpm-stage deb-stage tgz - run: make crossbuild - uses: actions/upload-artifact@v4 diff --git a/Makefile b/Makefile index 1cd2d82cc..35cd8bc84 100644 --- a/Makefile +++ b/Makefile @@ -111,12 +111,12 @@ rpm-v2: rpm-v2-x86 rpm-v2-arm .PHONY: rpm-v2-x86 rpm-v2-x86: crossbuild-package MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \ --define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 --define "dist .el7.centos" \ -bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \ --define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 --define "dist .amzn2" \ -bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec @@ -124,12 +124,12 @@ rpm-v2-x86: crossbuild-package .PHONY: rpm-v2-arm rpm-v2-arm: crossbuild-package MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-arm64" \ --define "_version ${VERSION}" --define "buildarch aarch64" --target aarch64 --define "dist .el7.centos" \ -bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-arm64" \ --define "_version ${VERSION}" --define "buildarch aarch64" --target aarch64 --define "dist .amzn2" \ -bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec @@ -151,7 +151,7 @@ rpm-kcps: rpm-kcps-v2 .PHONY: rpm-kcps-v2 rpm-kcps-v2: crossbuild-package-kcps MACKEREL_AGENT_NAME=mackerel-agent-kcps _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \ --define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 --define "dist .el7.centos" \ -bb packaging/rpm-build/mackerel-agent-kcps.spec @@ -167,7 +167,7 @@ rpm-stage: rpm-stage-v2 .PHONY: rpm-stage-v2 rpm-stage-v2: crossbuild-package-stage MACKEREL_AGENT_NAME=mackerel-agent-stage _tools/packaging/prepare-rpm-build.sh - docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \ + docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:u8 \ --define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \ --define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 --define "dist .el7.centos" \ -bb packaging/rpm-build/mackerel-agent-stage.spec From 53ce257d24b43a652d75e2206f7c0ab9035ecd22 Mon Sep 17 00:00:00 2001 From: yseto Date: Fri, 7 Jun 2024 15:04:30 +0900 Subject: [PATCH 2/3] do build a package for tests --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3b1b7ceb8..a49dd1f66 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: name: Build (Linux) runs-on: ubuntu-latest needs: test - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') +# if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') env: DEBIAN_FRONTEND: noninteractive steps: From cdd3210dd3806573ec99e61de118051ea717db93 Mon Sep 17 00:00:00 2001 From: yseto Date: Tue, 11 Jun 2024 10:58:39 +0900 Subject: [PATCH 3/3] Revert "do build a package for tests" This reverts commit 53ce257d24b43a652d75e2206f7c0ab9035ecd22. --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index a49dd1f66..3b1b7ceb8 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: name: Build (Linux) runs-on: ubuntu-latest needs: test -# if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') + if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') env: DEBIAN_FRONTEND: noninteractive steps: