From 1454b46365def044366f76917eb8434471670ce6 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Thu, 4 Aug 2022 16:31:04 +0200 Subject: [PATCH 1/8] ci: add deb and rpm packaging --- .github/workflows/release.yml | 55 ++++++++++++++++++++++++++++++++ .goreleaser.pkg.yml | 16 ++++++++++ GNUmakefile | 31 ++++++++++++++++++ specs/rpm/scaleway-cli.tmpl.spec | 41 ++++++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 .goreleaser.pkg.yml create mode 100644 GNUmakefile create mode 100644 specs/rpm/scaleway-cli.tmpl.spec diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63c0dd4313..c615e0ac0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,3 +29,58 @@ jobs: args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + package-deb: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.17 + - name: Add packaging config to goreleaser config + run: cat .goreleaser.pkg.yml >> .goreleaser.yml + - name: create gpg key + run: echo "${GPG_KEY}" > /root/gpg + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + - name: Build and package deb + run: ./goreleaser release --skip-validate --rm-dist --skip-publish +# - name: Build and package deb +# uses: goreleaser/goreleaser-action@v2 +# with: +# version: latest +# args: release --skip-validate --rm-dist --skip-publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GPG_KEY: '/root/gpg' + package-rpm: + runs-on: ubuntu-latest + container: fedora:latest + needs: [goreleaser] + steps: + - name: Get tag + id: get_tag + run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//} + - name: Get version + id: get_version + run: echo ::set-output name=VERSION::${TAG##v} + env: + TAG: ${{ steps.get_tag.outputs.TAG }} + - name: Install make + run: dnf install make -y + - name: Setup rpm-build + run: make rpm-setup + - name: Build srpm + run: make srpm-build + env: + VERSION: ${{ steps.get_version.outputs.VERSION }} + - name: Publish rpm + run: | + mkdir -p ~/.config + echo "${SCW_COPR_CONFIG}" > ~/.config/copr + copr-cli build @scaleway/staging ~/rpmbuild/SRPMS/scw-*.rpm + env: + SCW_COPR_CONFIG: ${{ secrets.SCW_COPR_CONFIG }} diff --git a/.goreleaser.pkg.yml b/.goreleaser.pkg.yml new file mode 100644 index 0000000000..6df2d6acdd --- /dev/null +++ b/.goreleaser.pkg.yml @@ -0,0 +1,16 @@ +nfpms: + - + package_name: scw + vendor: Scaleway + homepage: https://www.scaleway.com/ + description: Scaleway CLI is a tool to help you pilot your Scaleway infrastructure directly from your terminal. + maintainer: Scaleway Devtools + license: Apache 2.0 + formats: + - deb + deb: + signature: + key_file: '{{ .Env.GPG_KEY }}' + key_id: F5BF26CADF6F9614 + type: origin + diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000000..0831fd3802 --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,31 @@ +SHELL=bash + +rpm-setup: + sudo dnf groupinstall "RPM Development Tools" -y + sudo dnf install copr-cli -y + rpmdev-setuptree + sudo dnf install jq -y + +template-rpm-spec: require-version + sed s/\%\{version_\}/${VERSION}/g specs/rpm/scaleway-cli.tmpl.spec > specs/rpm/scaleway-cli.spec + RELEASE_JSON="$$(curl https://api.github.com/repos/scaleway/scaleway-cli/releases/tags/v${VERSION})"; \ + DATE=$$(date -d "$$(echo $${RELEASE_JSON} | jq ."created_at" -r)" "+%a %b %d %Y") ; \ + CHANGELOG="$$(echo $${RELEASE_JSON} | jq ."body" -r | grep '^*' | sed s/^\*/-/g)"; \ + echo "* $${DATE} Scaleway Devtools - ${VERSION}" >> specs/rpm/scaleway-cli.spec; \ + echo "$${CHANGELOG}" >> specs/rpm/scaleway-cli.spec + +srpm-build: require-version template-rpm-spec + sudo dnf builddep specs/rpm/scaleway-cli.spec -y + spectool -g -R specs/rpm/scaleway-cli.spec --define "version_ ${VERSION}" + rpmbuild -ba specs/rpm/scaleway-cli.spec --define "version_ ${VERSION}" + +rpm-build: srpm-build + cd ~/rpmbuild/ + rpmbuild -bs + +require-version: +ifndef VERSION + $(error VERSION is undefined) +endif + +.PHONY: rpm-setup rpm-build srpm-build diff --git a/specs/rpm/scaleway-cli.tmpl.spec b/specs/rpm/scaleway-cli.tmpl.spec new file mode 100644 index 0000000000..479ed72480 --- /dev/null +++ b/specs/rpm/scaleway-cli.tmpl.spec @@ -0,0 +1,41 @@ +Name: scw +Version: %{version_} +Release: 1%{?dist} +Summary: Scaleway CLI + +License: Apache License 2.0 +URL: https://github.com/scaleway/scaleway-cli +Source0: https://github.com/scaleway/scaleway-cli/archive/refs/tags/v%{version}.tar.gz + +%if 0%{?suse_version} +BuildRequires: go git +%else +BuildRequires: golang git +%endif + +Provides: %{name} = %{version} + +%description +Scaleway CLI + +%global debug_package %{nil} + +%prep +%autosetup -n scaleway-cli-%{version} + + +%build +export CGO_ENABLED=0 +LDFLAGS="-w -extldflags -static -X main.Version=%{version}" +GOPROXY=direct GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS}" -o %{name} cmd/scw/main.go + + +%install +install -Dpm 0755 %{name} %{buildroot}%{_bindir}/%{name} + + +%files +%{_bindir}/%{name} + + +%changelog From 74fd5ec7bf795f821f45c8b30e067b30c76aeddf Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 30 Aug 2022 11:45:35 +0200 Subject: [PATCH 2/8] add deb specs and rules in makefile --- GNUmakefile | 16 ++++++++++++++++ specs/deb/changelog | 1 + specs/deb/control | 12 ++++++++++++ specs/deb/rules | 10 ++++++++++ specs/rpm/.gitignore | 1 + 5 files changed, 40 insertions(+) create mode 100644 specs/deb/changelog create mode 100644 specs/deb/control create mode 100755 specs/deb/rules create mode 100644 specs/rpm/.gitignore diff --git a/GNUmakefile b/GNUmakefile index 0831fd3802..fdb43b7afc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,6 +23,22 @@ rpm-build: srpm-build cd ~/rpmbuild/ rpmbuild -bs +template-deb: + RELEASE_JSON="$$(curl https://api.github.com/repos/scaleway/scaleway-cli/releases/tags/v${VERSION})"; \ + CHANGELOG="$$(echo $${RELEASE_JSON} | jq ."body" -r | grep '^*' | sed s/^\*/\ \ \*/g)"; \ + DATE=$$(date -d "$$(echo $${RELEASE_JSON} | jq ."created_at" -r)" -R) ; \ + echo -e "scw (${VERSION}) focal; urgency=medium\n" > specs/deb/changelog; \ + echo "$${CHANGELOG}" >> specs/deb/changelog; \ + echo -e "\n -- Scaleway Devtools $${DATE}" >> specs/deb/changelog + +deb-setup: + apt install devscripts equivs jq -y + mk-build-deps --install debian/control + go mod vendor + +deb-source-build: deb-setup template-deb + debuild -S -k524A68BAB1A91B2F74DCEC3B31F9FBCA5BD8707C + require-version: ifndef VERSION $(error VERSION is undefined) diff --git a/specs/deb/changelog b/specs/deb/changelog new file mode 100644 index 0000000000..9fad0afc72 --- /dev/null +++ b/specs/deb/changelog @@ -0,0 +1 @@ +## File should be updated by \ No newline at end of file diff --git a/specs/deb/control b/specs/deb/control new file mode 100644 index 0000000000..d7fad1b179 --- /dev/null +++ b/specs/deb/control @@ -0,0 +1,12 @@ +Source: scw +Homepage: https://www.scaleway.com/ +Maintainer: Scaleway Devtools +Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 13), + dh-golang, + golang-any, + +Package: scw +Architecture: all +Description: Scaleway CLI +XS-Go-Import-Path: github.com/scaleway/scaleway-cli/v2/cmd/scw diff --git a/specs/deb/rules b/specs/deb/rules new file mode 100755 index 0000000000..dfc84ad181 --- /dev/null +++ b/specs/deb/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +export DH_GOPKG := github.com/scaleway/scaleway-cli/v2 +export DH_GOLANG_BUILDPKG := ${DH_GOPKG}/cmd/scw + +%: + dh $@ --builddirectory=_build + +override_dh_auto_install: + dh_auto_install -- --no-source \ No newline at end of file diff --git a/specs/rpm/.gitignore b/specs/rpm/.gitignore new file mode 100644 index 0000000000..e2c466f3da --- /dev/null +++ b/specs/rpm/.gitignore @@ -0,0 +1 @@ +scaleway-cli.spec \ No newline at end of file From c45bb0fd3a8062a427c4425b5bf6be131f08a189 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 30 Aug 2022 14:56:10 +0200 Subject: [PATCH 3/8] add debian symlink creation to deb-setup --- GNUmakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/GNUmakefile b/GNUmakefile index fdb43b7afc..912ba42d64 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -35,6 +35,7 @@ deb-setup: apt install devscripts equivs jq -y mk-build-deps --install debian/control go mod vendor + ln -s specs/deb debian deb-source-build: deb-setup template-deb debuild -S -k524A68BAB1A91B2F74DCEC3B31F9FBCA5BD8707C From 77a92d7933d4196187fae3b2b51a4568297a7f81 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Wed, 14 Sep 2022 11:47:16 +0200 Subject: [PATCH 4/8] fix deb build order of execution and accept auto install --- GNUmakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 912ba42d64..02e56e423c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -33,11 +33,11 @@ template-deb: deb-setup: apt install devscripts equivs jq -y - mk-build-deps --install debian/control + ln -fs specs/deb debian + mk-build-deps --install debian/control -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" go mod vendor - ln -s specs/deb debian -deb-source-build: deb-setup template-deb +deb-source-build: template-deb deb-setup debuild -S -k524A68BAB1A91B2F74DCEC3B31F9FBCA5BD8707C require-version: From d593bfdd497b4b82183c6b663e8080847c1928d5 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Mon, 3 Oct 2022 16:06:04 +0200 Subject: [PATCH 5/8] deb: sign package and set version --- .goreleaser.pkg.yml | 16 ---------------- GNUmakefile | 21 +++++++++++++++++---- specs/deb/control | 1 + specs/deb/rules | 7 ++++++- 4 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 .goreleaser.pkg.yml diff --git a/.goreleaser.pkg.yml b/.goreleaser.pkg.yml deleted file mode 100644 index 6df2d6acdd..0000000000 --- a/.goreleaser.pkg.yml +++ /dev/null @@ -1,16 +0,0 @@ -nfpms: - - - package_name: scw - vendor: Scaleway - homepage: https://www.scaleway.com/ - description: Scaleway CLI is a tool to help you pilot your Scaleway infrastructure directly from your terminal. - maintainer: Scaleway Devtools - license: Apache 2.0 - formats: - - deb - deb: - signature: - key_file: '{{ .Env.GPG_KEY }}' - key_id: F5BF26CADF6F9614 - type: origin - diff --git a/GNUmakefile b/GNUmakefile index 02e56e423c..24ff9876fc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,7 +23,10 @@ rpm-build: srpm-build cd ~/rpmbuild/ rpmbuild -bs -template-deb: +template-deb-setup: + apt install curl jq -y + +template-deb: template-deb-setup require-version RELEASE_JSON="$$(curl https://api.github.com/repos/scaleway/scaleway-cli/releases/tags/v${VERSION})"; \ CHANGELOG="$$(echo $${RELEASE_JSON} | jq ."body" -r | grep '^*' | sed s/^\*/\ \ \*/g)"; \ DATE=$$(date -d "$$(echo $${RELEASE_JSON} | jq ."created_at" -r)" -R) ; \ @@ -32,13 +35,23 @@ template-deb: echo -e "\n -- Scaleway Devtools $${DATE}" >> specs/deb/changelog deb-setup: - apt install devscripts equivs jq -y + apt install devscripts equivs -y ln -fs specs/deb debian mk-build-deps --install debian/control -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" go mod vendor -deb-source-build: template-deb deb-setup - debuild -S -k524A68BAB1A91B2F74DCEC3B31F9FBCA5BD8707C +deb-source-build: require-version template-deb deb-setup + debuild -S -us -uc + +deb-source-sign: require-version + echo '$(value GPG_PASSPHRASE)' > /tmp/key + debsign -k524A68BAB1A91B2F74DCEC3B31F9FBCA5BD8707C --re-sign -p"gpg --pinentry-mode=loopback --passphrase-file /tmp/key" ../scw_${VERSION}.dsc ../scw_${VERSION}_source.changes + rm /tmp/key + +deb-source: deb-source-build deb-source-sign + +deb-build: + debuild -b -us -uc require-version: ifndef VERSION diff --git a/specs/deb/control b/specs/deb/control index d7fad1b179..e9cd75eb0a 100644 --- a/specs/deb/control +++ b/specs/deb/control @@ -10,3 +10,4 @@ Package: scw Architecture: all Description: Scaleway CLI XS-Go-Import-Path: github.com/scaleway/scaleway-cli/v2/cmd/scw +Version: ${VERSION} \ No newline at end of file diff --git a/specs/deb/rules b/specs/deb/rules index dfc84ad181..ece5f8cf12 100755 --- a/specs/deb/rules +++ b/specs/deb/rules @@ -3,8 +3,13 @@ export DH_GOPKG := github.com/scaleway/scaleway-cli/v2 export DH_GOLANG_BUILDPKG := ${DH_GOPKG}/cmd/scw +VERSION := $(shell dpkg-parsechangelog -SVersion) + %: dh $@ --builddirectory=_build override_dh_auto_install: - dh_auto_install -- --no-source \ No newline at end of file + dh_auto_install -- --no-source + +override_dh_auto_build: + dh_auto_build -- -ldflags "-w -extldflags -static -X main.Version=${VERSION}" From b5b06624f5d8c7d1c2a5c4eff11dddb2b9860abe Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Mon, 3 Oct 2022 16:10:11 +0200 Subject: [PATCH 6/8] ci(deb): fetch version, import gpg key, package deb --- .github/workflows/release.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c615e0ac0d..38fd80b5ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,26 +36,29 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v2 - with: - go-version: 1.17 - - name: Add packaging config to goreleaser config - run: cat .goreleaser.pkg.yml >> .goreleaser.yml + - name: Get tag + id: get_tag + run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//} + - name: Get version + id: get_version + run: echo ::set-output name=VERSION::${TAG##v} + env: + TAG: ${{ steps.get_tag.outputs.TAG }} - name: create gpg key run: echo "${GPG_KEY}" > /root/gpg env: GPG_KEY: ${{ secrets.GPG_KEY }} + - name: import gpg key + run: gpg --pinentry-mode=loopback --passphrase "$GPG_PASSPHRASE" --import /root/gpg + env: + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + - name: Install make + run: apt install make -y - name: Build and package deb - run: ./goreleaser release --skip-validate --rm-dist --skip-publish -# - name: Build and package deb -# uses: goreleaser/goreleaser-action@v2 -# with: -# version: latest -# args: release --skip-validate --rm-dist --skip-publish + run: make deb-source env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GPG_KEY: '/root/gpg' + VERSION: ${{ steps.get_version.outputs.VERSION }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} package-rpm: runs-on: ubuntu-latest container: fedora:latest From 0d73b1be5302b8061d42ab27b58af1c2d6627942 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Fri, 7 Oct 2022 15:59:40 +0200 Subject: [PATCH 7/8] deb: add metadata to binary build --- cmd/scw/main.go | 2 +- specs/deb/rules | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/scw/main.go b/cmd/scw/main.go index 1f3f73165f..06ac754ed8 100644 --- a/cmd/scw/main.go +++ b/cmd/scw/main.go @@ -20,7 +20,7 @@ var ( // These are initialized by the build script - BuildDate = "unknown" // date -u '+%Y-%m-%d_%I:%M:%S%p' + BuildDate = "unknown" // RFC3339: date -u '+%Y-%m-%dT%H:%M:%SZ' GitBranch = "unknown" // git symbolic-ref -q --short HEAD || echo HEAD" GitCommit = "unknown" // git rev-parse --short HEAD diff --git a/specs/deb/rules b/specs/deb/rules index ece5f8cf12..c38ccf43b6 100755 --- a/specs/deb/rules +++ b/specs/deb/rules @@ -4,6 +4,10 @@ export DH_GOPKG := github.com/scaleway/scaleway-cli/v2 export DH_GOLANG_BUILDPKG := ${DH_GOPKG}/cmd/scw VERSION := $(shell dpkg-parsechangelog -SVersion) +SOURCE_DATE_EPOCH := $(shell git log -1 --pretty=%ct) +DATE := $(shell date --date="@${SOURCE_DATE_EPOCH}" -u '+%Y-%m-%dT%H:%M:%SZ') +GIT_BRANCH := $(shell git symbolic-ref -q --short HEAD || echo HEAD) +GIT_COMMIT := $(shell git rev-parse --short HEAD) %: dh $@ --builddirectory=_build @@ -12,4 +16,4 @@ override_dh_auto_install: dh_auto_install -- --no-source override_dh_auto_build: - dh_auto_build -- -ldflags "-w -extldflags -static -X main.Version=${VERSION}" + dh_auto_build -- -ldflags "-w -extldflags -static -X main.Version=${VERSION} -X main.BuildDate=${DATE} -X main.GitBranch=${GIT_BRANCH} -X main.GitCommit=${GIT_COMMIT}" From 84b84f15292ef1d4e5e7f59cda16cf2c6d3cfa76 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Fri, 7 Oct 2022 16:50:03 +0200 Subject: [PATCH 8/8] rpm: add metadata to binary build --- specs/rpm/scaleway-cli.tmpl.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specs/rpm/scaleway-cli.tmpl.spec b/specs/rpm/scaleway-cli.tmpl.spec index 479ed72480..3f9a585a7f 100644 --- a/specs/rpm/scaleway-cli.tmpl.spec +++ b/specs/rpm/scaleway-cli.tmpl.spec @@ -23,10 +23,14 @@ Scaleway CLI %prep %autosetup -n scaleway-cli-%{version} +%define build_epoch %(git log -1 --pretty="%%ct") +%define build_date %(date --date="@%{build_epoch}" -u +"%%Y-%%m-%%dT%%H:%%M:%%SZ") +%define git_branch %(git symbolic-ref -q --short HEAD || echo HEAD) +%define git_commit %(git rev-parse --short HEAD) %build export CGO_ENABLED=0 -LDFLAGS="-w -extldflags -static -X main.Version=%{version}" +LDFLAGS="-w -extldflags -static -X main.Version=%{version} -X main.BuildDate=%{build_date} -X main.GitBranch=%{git_branch} -X main.GitCommit=%{git_commit}" GOPROXY=direct GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS}" -o %{name} cmd/scw/main.go