From b31daabf52d1f003539ee833b4c7621d6a8d5fab Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Sun, 11 Apr 2021 09:38:46 -0600 Subject: [PATCH] Add arm6 release builds --- .github/workflows/release.linux.yml | 21 +++++++++++++-------- .github/workflows/release.linux_static.yml | 15 ++++++++++----- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.linux.yml b/.github/workflows/release.linux.yml index a700306..358b240 100644 --- a/.github/workflows/release.linux.yml +++ b/.github/workflows/release.linux.yml @@ -15,11 +15,16 @@ jobs: - arch: arm64 cc: aarch64-linux-gnu-gcc - arch: arm + arm: 6 + cc: arm-linux-gnueabi-gcc + - arch: arm + arm: 7 cc: arm-linux-gnueabihf-gcc env: GOOS: linux GOARCH: ${{ matrix.arch }} + GOARM: ${{ matrix.arm }} CC: ${{ matrix.cc }} steps: @@ -34,7 +39,7 @@ jobs: - name: Install cross-compilers run: | sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf + sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi - name: Install nfpm run: | @@ -50,8 +55,8 @@ jobs: CGO_ENABLED=1 go build -ldflags "-X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream cd dist - tar -czvf litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz litestream - ../nfpm pkg --config nfpm.yml --packager deb --target litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb + tar -czvf litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.tar.gz litestream + ../nfpm pkg --config nfpm.yml --packager deb --target litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.deb - name: Upload release binary uses: actions/upload-release-asset@v1.0.2 @@ -60,7 +65,7 @@ jobs: with: upload_url: ${{ steps.release.outputs.upload_url }} asset_path: ./dist/litestream - asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }} + asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }} asset_content_type: application/octet-stream - name: Upload release tarball @@ -69,8 +74,8 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.release.outputs.upload_url }} - asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz - asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz + asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.tar.gz + asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.tar.gz asset_content_type: application/gzip - name: Upload debian package @@ -79,6 +84,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.release.outputs.upload_url }} - asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb - asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb + asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.deb + asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}.deb asset_content_type: application/octet-stream diff --git a/.github/workflows/release.linux_static.yml b/.github/workflows/release.linux_static.yml index e5792dc..177acd3 100644 --- a/.github/workflows/release.linux_static.yml +++ b/.github/workflows/release.linux_static.yml @@ -15,11 +15,16 @@ jobs: - arch: arm64 cc: aarch64-linux-gnu-gcc - arch: arm + arm: 6 + cc: arm-linux-gnueabi-gcc + - arch: arm + arm: 7 cc: arm-linux-gnueabihf-gcc env: GOOS: linux GOARCH: ${{ matrix.arch }} + GOARM: ${{ matrix.arm }} CC: ${{ matrix.cc }} steps: @@ -34,7 +39,7 @@ jobs: - name: Install cross-compilers run: | sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf + sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi - name: Build litestream run: | @@ -42,7 +47,7 @@ jobs: mkdir -p dist CGO_ENABLED=1 go build -ldflags "-w -extldflags "-static" -X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream cd dist - tar -czvf litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz litestream + tar -czvf litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}-static.tar.gz litestream - name: Upload release binary uses: actions/upload-release-asset@v1.0.2 @@ -51,7 +56,7 @@ jobs: with: upload_url: ${{ steps.release.outputs.upload_url }} asset_path: ./dist/litestream - asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static + asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}-static asset_content_type: application/octet-stream - name: Upload release tarball @@ -60,6 +65,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.release.outputs.upload_url }} - asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz - asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz + asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}-static.tar.gz + asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}${{ env.GOARM }}-static.tar.gz asset_content_type: application/gzip