From 98d569fb18d4e811db3e4ced0571b0e17f5951c6 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Thu, 26 Aug 2021 18:14:43 +0200 Subject: [PATCH 01/22] Try to duplicate steps --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0a4b798..e15040f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,17 @@ deploy: on: tags: true repo: heroku/log-shuttle +- provider: packagecloud + skip_cleanup: true + repository: open + username: heroku + token: + secure: GcoejgkhMk8JC9KJQwKho0XDST2adk/7HzEM1+5CiftXgc+Y17+GLIBm4uKaVIqugkMPU5av3IbAMJkcyoSN9rpiPoYBbc/cCxoR8OCMYWASuD25+U75ptMTV692jLYr2VKa4wJ+vg1IIwsNJ5ypGuxLFpc7SOd4LylaBQ3S0go= + dist: ubuntu/focal + package_glob: "*.deb" + on: + tags: true + repo: heroku/log-shuttle - provider: packagecloud skip_cleanup: true repository: open From 43e0e2484f87237d8d703e514fc957846ffc1ac4 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 13:49:43 +0200 Subject: [PATCH 02/22] Start GHA migration --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ .travis.yml | 11 ----------- 2 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b6ef529 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: Build packages +on: [push] +env: + GO_LINKER_SYMBOL: main.version + GO_BUILD_ENV: GOOS=linux GOARCH=amd64 +jobs: + build-ubuntu-packages: + runs-on: [ubuntu-latest, self-hosted] + strategy: + matrix: + releases: [trusty] + steps: + - uses: actions/checkout@v2 + with: + path: ./src/github.com/${{ github.repository }} + - uses: actions/setup-go@v2 + with: + go-version: 1.13 + - name: Set ENV + run: | + echo "GOPATH=$(dirname $GITHUB_WORKSPACE)" >> $GITHUB_ENV + echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV + echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV + echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV + echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV + echo $env + - name: Build log-shuttle + run: | + mkdir -p ${TMP}/DEBIAN + go build -v -o ${TMP}/usr/bin/log-shuttle ${LDFLAGS} ./cmd/log-shuttle + cat ./misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${TMP}/DEBIAN/control diff --git a/.travis.yml b/.travis.yml index e15040f..0a4b798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,17 +19,6 @@ deploy: on: tags: true repo: heroku/log-shuttle -- provider: packagecloud - skip_cleanup: true - repository: open - username: heroku - token: - secure: GcoejgkhMk8JC9KJQwKho0XDST2adk/7HzEM1+5CiftXgc+Y17+GLIBm4uKaVIqugkMPU5av3IbAMJkcyoSN9rpiPoYBbc/cCxoR8OCMYWASuD25+U75ptMTV692jLYr2VKa4wJ+vg1IIwsNJ5ypGuxLFpc7SOd4LylaBQ3S0go= - dist: ubuntu/focal - package_glob: "*.deb" - on: - tags: true - repo: heroku/log-shuttle - provider: packagecloud skip_cleanup: true repository: open From ebc7928d022e4a4c4634744790398d92d64a1065 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 13:51:06 +0200 Subject: [PATCH 03/22] Non self hosted env --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6ef529..2ba037d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ env: GO_BUILD_ENV: GOOS=linux GOARCH=amd64 jobs: build-ubuntu-packages: - runs-on: [ubuntu-latest, self-hosted] + runs-on: [ubuntu-latest] strategy: matrix: releases: [trusty] From 7a9f05af23c3ec34812b8ac74440d5b3716e9de7 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 13:57:21 +0200 Subject: [PATCH 04/22] Remove flags --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ba037d..8e61714 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: go-version: 1.13 - name: Set ENV run: | - echo "GOPATH=$(dirname $GITHUB_WORKSPACE)" >> $GITHUB_ENV echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV From 1ffa26a6fdc2da84904272834a0e6397835dfb02 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 14:00:21 +0200 Subject: [PATCH 05/22] Get to the source dir --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e61714..e167d90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ jobs: go-version: 1.13 - name: Set ENV run: | + cd src/github.com/${{ github.repository}} echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV From 2642374300e42cabe9e22f44d2780fd92353daaa Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 14:17:39 +0200 Subject: [PATCH 06/22] Not exported yet --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e167d90..2d2965b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: run: | cd src/github.com/${{ github.repository}} echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV - echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV + echo "VERSION=$(git describe --tags --always | sed s/^v//)" >> $GITHUB_ENV echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV echo $env From ea1c96e10fbed85778bd39badcfa6d4ba0426e6a Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 14:19:45 +0200 Subject: [PATCH 07/22] Split env setup --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d2965b..89f9c09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,14 +16,15 @@ jobs: - uses: actions/setup-go@v2 with: go-version: 1.13 - - name: Set ENV + - name: Set GO_LINKER_VALUE run: | cd src/github.com/${{ github.repository}} echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV - echo "VERSION=$(git describe --tags --always | sed s/^v//)" >> $GITHUB_ENV + - name: Set env + run: | + echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - echo $env - name: Build log-shuttle run: | mkdir -p ${TMP}/DEBIAN From 62fa112b562d6cf21047a154e0fa370276325151 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 14:21:41 +0200 Subject: [PATCH 08/22] Get tags --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89f9c09..54c4538 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v2 with: path: ./src/github.com/${{ github.repository }} + fetch-depth: 0 - uses: actions/setup-go@v2 with: go-version: 1.13 From c94852323b96fea443e6962e26f58eac2a3d6f38 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 14:27:12 +0200 Subject: [PATCH 09/22] Do not escape --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54c4538..6b80079 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: Set env run: | echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV + echo "LDFLAGS=-ldflags "-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - name: Build log-shuttle run: | From 681d0f15afa48fb05ad0f274c81b7c332d165c31 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:03:05 +0200 Subject: [PATCH 10/22] What if we remove the paths --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b80079..73d3d2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,14 +12,12 @@ jobs: steps: - uses: actions/checkout@v2 with: - path: ./src/github.com/${{ github.repository }} fetch-depth: 0 - uses: actions/setup-go@v2 with: go-version: 1.13 - name: Set GO_LINKER_VALUE run: | - cd src/github.com/${{ github.repository}} echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV - name: Set env run: | From acd3dccbfb4e33ca6a577b3b7481d7795a4242cc Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:07:37 +0200 Subject: [PATCH 11/22] Try single quotes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73d3d2a..4cf9993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Set env run: | echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "LDFLAGS=-ldflags "-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}"" >> $GITHUB_ENV + echo "LDFLAGS=-ldflags '-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}'" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - name: Build log-shuttle run: | From 641e9fa3fc2e96202989db798749afea963929a7 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:08:43 +0200 Subject: [PATCH 12/22] Revert "Try single quotes" This reverts commit acd3dccbfb4e33ca6a577b3b7481d7795a4242cc. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cf9993..73d3d2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Set env run: | echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "LDFLAGS=-ldflags '-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}'" >> $GITHUB_ENV + echo "LDFLAGS=-ldflags "-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - name: Build log-shuttle run: | From aae670afbf481380d517b51f7c700d2ba0200dff Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:13:55 +0200 Subject: [PATCH 13/22] Give me back my quotes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73d3d2a..4ebdf36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Set env run: | echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "LDFLAGS=-ldflags "-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}"" >> $GITHUB_ENV + echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - name: Build log-shuttle run: | From 569c5f6611ca6ed9e02d96b3ec1908286e25e610 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:19:17 +0200 Subject: [PATCH 14/22] Simplify the calls --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ebdf36..e34fd1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,9 @@ jobs: - name: Set env run: | echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "LDFLAGS=-ldflags \"-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}\"" >> $GITHUB_ENV echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - name: Build log-shuttle run: | mkdir -p ${TMP}/DEBIAN - go build -v -o ${TMP}/usr/bin/log-shuttle ${LDFLAGS} ./cmd/log-shuttle + go build -v -o ${TMP}/usr/bin/log-shuttle -ldflags='-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}' ./cmd/log-shuttle cat ./misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${TMP}/DEBIAN/control From 8af91d12f099dee297c8846e2d60e1b2d3e88d12 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Fri, 27 Aug 2021 15:21:19 +0200 Subject: [PATCH 15/22] Inline the main.version --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e34fd1e..11f97a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,6 @@ name: Build packages on: [push] env: - GO_LINKER_SYMBOL: main.version GO_BUILD_ENV: GOOS=linux GOARCH=amd64 jobs: build-ubuntu-packages: @@ -26,5 +25,5 @@ jobs: - name: Build log-shuttle run: | mkdir -p ${TMP}/DEBIAN - go build -v -o ${TMP}/usr/bin/log-shuttle -ldflags='-X ${GO_LINKER_SYMBOL}=${GO_LINKER_VALUE}' ./cmd/log-shuttle + go build -v -o ${TMP}/usr/bin/log-shuttle -ldflags="-X main.version=${GO_LINKER_VALUE}" ./cmd/log-shuttle cat ./misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${TMP}/DEBIAN/control From 6f3a7464590b92d85c274c5e210ff12eb1329160 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Tue, 7 Sep 2021 13:28:38 +0200 Subject: [PATCH 16/22] dpkg-deb adition --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11f97a6..04359d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,6 @@ env: jobs: build-ubuntu-packages: runs-on: [ubuntu-latest] - strategy: - matrix: - releases: [trusty] steps: - uses: actions/checkout@v2 with: @@ -27,3 +24,6 @@ jobs: mkdir -p ${TMP}/DEBIAN go build -v -o ${TMP}/usr/bin/log-shuttle -ldflags="-X main.version=${GO_LINKER_VALUE}" ./cmd/log-shuttle cat ./misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${TMP}/DEBIAN/control + dpkg-deb -Zgzip -b ${TMP} log-shuttle_${VERSION}_amd64.deb + ls -laR + From 53c7e71847b811e6622c52470cf75b47bf2bc2bc Mon Sep 17 00:00:00 2001 From: Will Farrington Date: Thu, 16 Sep 2021 14:44:09 -0400 Subject: [PATCH 17/22] spike out an example of what a more conformation debuild process would look like --- .github/workflows/build.yml | 25 ++++++------------------- Makefile | 8 -------- debian/changelog | 6 ++++++ debian/control | 22 ++++++++++++++++++++++ debian/copyright | 3 +++ debian/lintian-overrides | 1 + debian/rules | 7 +++++++ debian/source/format | 1 + debian/source/lintian-overrides | 1 + misc/DEBIAN.control | 7 ------- 10 files changed, 47 insertions(+), 34 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/lintian-overrides create mode 100644 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/lintian-overrides delete mode 100644 misc/DEBIAN.control diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04359d5..c3f25c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,5 @@ name: Build packages on: [push] -env: - GO_BUILD_ENV: GOOS=linux GOARCH=amd64 jobs: build-ubuntu-packages: runs-on: [ubuntu-latest] @@ -9,21 +7,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: actions/setup-go@v2 - with: - go-version: 1.13 - - name: Set GO_LINKER_VALUE - run: | - echo "GO_LINKER_VALUE=$(git describe --tags --always)" >> $GITHUB_ENV - - name: Set env - run: | - echo "VERSION=$(echo ${GO_LINKER_VALUE} | sed s/^v//)" >> $GITHUB_ENV - echo "TMP=$(mktemp -d -t log_shuttle.XXXXX)" >> $GITHUB_ENV - - name: Build log-shuttle + - name: install dependencies + run: apt-get install -y dh-golang git vim devscripts equivs + - name: build package run: | - mkdir -p ${TMP}/DEBIAN - go build -v -o ${TMP}/usr/bin/log-shuttle -ldflags="-X main.version=${GO_LINKER_VALUE}" ./cmd/log-shuttle - cat ./misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${TMP}/DEBIAN/control - dpkg-deb -Zgzip -b ${TMP} log-shuttle_${VERSION}_amd64.deb - ls -laR - + mk-build-deps --install debian/control + debuild -i -us -uc -b + dpkg -i ../log-shuttle*.deb diff --git a/Makefile b/Makefile index c9a8ec3..7b646c4 100644 --- a/Makefile +++ b/Makefile @@ -16,14 +16,6 @@ update-deps: govendor govendor: go get -u github.com/kardianos/govendor -debs: tmp ldflags ver - $(eval DEB_ROOT := "${TMP}/DEBIAN") - ${GO_BUILD_ENV} go build -v -o ${TMP}/usr/bin/log-shuttle ${LDFLAGS} ./cmd/log-shuttle - mkdir -p ${DEB_ROOT} - cat misc/DEBIAN.control | sed s/{{VERSION}}/${VERSION}/ > ${DEB_ROOT}/control - dpkg-deb -Zgzip -b ${TMP} log-shuttle_${VERSION}_amd64.deb - rm -rf ${TMP} - glv: $(eval GO_LINKER_VALUE := $(shell git describe --tags --always)) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..33d8f9d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ + +log-shuttle (0.19.1) focal; urgency=medium + + * update github key + + -- Will Farrington Thu, 16 Sep 2021 12:49:23 -0400 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..7688d26 --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: log-shuttle +Section: devel +Priority: optional +Maintainer: Heroku +Uploaders: Will Farrington +Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 12), + golang-any +Standards-Version: 4.4.0 +XS-Go-Import-Path: github.com/heroku/log-shuttle +Vcs-Browser: https://github.com/heroku/log-shuttle +Vcs-Git: https://github.com/heroku/log-shuttle.git +Testsuite: autopkgtest-pkg-go + +Package: log-shuttle +Architecture: any +Depends: dpkg-dev, + ${misc:Depends}, + ${shlibs:Depends}, +Built-Using: ${misc:Built-Using}, +Description: Heroku log-shuttle + Log-shuttle is an open source UNIX program that delivers messages from applications and daemons to log routers and processors via HTTPs. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c0548f3 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,3 @@ +Files: * +Copyright: 2013-2021 Heroku Inc. +License: MIT diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..61d258a --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1 @@ +binary-without-manpage diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..dd90bba --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +%: + dh $@ --builddirectory=_build --buildsystem=golang diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..448b057 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1 @@ +diff-contains-git-control-dir diff --git a/misc/DEBIAN.control b/misc/DEBIAN.control deleted file mode 100644 index f6ae400..0000000 --- a/misc/DEBIAN.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: log-shuttle -Version: {{VERSION}} -Architecture: amd64 -Maintainer: "Edward Muller" -Section: heroku -Priority: optional -Description: Shuttle logs from stdout to logplex/log-iss/kinesis and other destinations From 59cfef374d1c7454ac3bf7e9d164e8bd18b1a8b7 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Mon, 11 Oct 2021 14:36:25 +0200 Subject: [PATCH 18/22] Update yaml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3f25c1..a0a8bb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,6 @@ jobs: run: apt-get install -y dh-golang git vim devscripts equivs - name: build package run: | - mk-build-deps --install debian/control - debuild -i -us -uc -b - dpkg -i ../log-shuttle*.deb + mk-build-deps --install debian/control + debuild -i -us -uc -b + dpkg -i ../log-shuttle*.deb From fcc6b7420f04a9d583b9fe899bb252026a5f5baa Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Mon, 11 Oct 2021 14:39:26 +0200 Subject: [PATCH 19/22] Sudo the thing --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0a8bb8..ce10c65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: with: fetch-depth: 0 - name: install dependencies - run: apt-get install -y dh-golang git vim devscripts equivs + run: sudo apt-get install -y dh-golang git vim devscripts equivs - name: build package run: | mk-build-deps --install debian/control From db5a25c18c4b08f2981987387332d98e2317bef8 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Mon, 11 Oct 2021 14:41:10 +0200 Subject: [PATCH 20/22] Sudo all the commands --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce10c65..003bf7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,6 @@ jobs: run: sudo apt-get install -y dh-golang git vim devscripts equivs - name: build package run: | - mk-build-deps --install debian/control - debuild -i -us -uc -b + sudo mk-build-deps --install debian/control + sudo debuild -i -us -uc -b dpkg -i ../log-shuttle*.deb From 8a542c789eca7205929a2ca5892d84c45f7d78bb Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 13 Oct 2021 12:10:21 +0200 Subject: [PATCH 21/22] Build on tags and push to focal and trusty --- .github/workflows/build.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 003bf7f..8f630f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,16 +1,32 @@ name: Build packages -on: [push] +on: + push: + tags: + - '*' jobs: build-ubuntu-packages: runs-on: [ubuntu-latest] steps: + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 - uses: actions/checkout@v2 with: fetch-depth: 0 - name: install dependencies - run: sudo apt-get install -y dh-golang git vim devscripts equivs - - name: build package + run: sudo apt-get update && apt-get install -y dh-golang git vim devscripts equivs build-essential golang-1.13-go golang-1.13-src golang-any golang-go golang-src + - name: Install packagecloud + run: gem install package_cloud + - name: build packagemk-build-deps run: | sudo mk-build-deps --install debian/control sudo debuild -i -us -uc -b - dpkg -i ../log-shuttle*.deb + + - name: push package to packagecloud + run: | + SUPPORTED_UBUNTU_VERSIONS="trusty focal" + for ubuntu_version in ${SUPPORTED_UBUNTU_VERSIONS} + do + package_cloud push --skip-errors --yes ${PACKAGECLOUD_REPO}/ubuntu/${ubuntu_version} ../*.deb + done + From 672ecab4dfe4a0b3d3b8c5897e2b394341cad132 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 13 Oct 2021 14:16:33 +0200 Subject: [PATCH 22/22] Remove travis config --- .travis.yml | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0a4b798..0000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: go -services: -- docker -go: -- go1.13.x -script: -- make test -before_deploy: -- make debs -- export DEB_VERSION=$(git describe --tags --always | sed s/^v//) -- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -- make docker-push -deploy: -- provider: releases - skip_cleanup: true - api_key: - secure: "oRgJdZouAhHxSfwNSuI5fy6pCsvsCuPfvqzt6i11js77CFvtyLu3XlG8kWVKNeJGxPU+Lnu5Hn6xhSYD8zx+UqchgnPlxuzouzhefIyD9WIbsyQw3jSlZukqXPijjcDd3x3QbiBESyyG4TDK2N9YDAG00XJVt2A8p0dZ01cuDww=" - file: log-shuttle_${DEB_VERSION}_amd64.deb - on: - tags: true - repo: heroku/log-shuttle -- provider: packagecloud - skip_cleanup: true - repository: open - username: heroku - token: - secure: GcoejgkhMk8JC9KJQwKho0XDST2adk/7HzEM1+5CiftXgc+Y17+GLIBm4uKaVIqugkMPU5av3IbAMJkcyoSN9rpiPoYBbc/cCxoR8OCMYWASuD25+U75ptMTV692jLYr2VKa4wJ+vg1IIwsNJ5ypGuxLFpc7SOd4LylaBQ3S0go= - dist: ubuntu/trusty - package_glob: "*.deb" - on: - tags: true - repo: heroku/log-shuttle -env: - global: #DOCKER_EMAIL, DOCKER_PASSWORD, DOCKER_USERNAME - - secure: pNIDqDmqOWV3afbSY11QaIAdnsZyQ+/OA+gMLpeA44EPkj4yoTbDVBv8Y5sHlpPkP1fmPsfZKPNTbVXUnGPkJ4Y2dFVt8n5sJYtlV+pHzPf50JUmGNzxuxb9bWxKP5XM/ka3wujAibZMQdJDeMhP9Q0CSi8x5L/wQN+8hB56DhY= - - secure: Ps5ZA+Tg6k3dwkGcabl+4ci47ARwzzQDKka/3TgnSBroHqvuF6yx0/XnDv3GNe9kUE402apAO4Kt1aEBSQ8DExwCdyCv8f8RzsiygjrkYEPiDbVPgIvmru6xMWAr/MPWv3xWQF1Yf1AzOtDvXOgRiFgGIBLMYVAPYMCgS8AuPFU= - - secure: jOlEUnly5Kvats37qv9/p0YtqToYgehV4SI9qQ6YW+Zzzmz3rwkH/ht/pcDnTcUMYb67HXtmutOTs/NG0F23S6RwCgioc7GEaUW21OXUNkKorSmizPzDv36NH0nzJVrG2WRTzoKErsBoVieT2MxOtQrASEwMSHtJdfOD5NCIijo=