rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #148 from benbjohnson/arm

Browse Source 
Support ARM release builds
This commit is contained in:
Ben Johnson
2021-04-10 08:48:32 -06:00
committed by GitHub
parent 178cf836b1 462330ead6
commit 5c0b8536f0
6 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.github/workflows/release.linux_amd64.yml → .github/workflows/release.linux.yml vendored
View File

@@ -3,10 +3,25 @@ on:
types: types:
- created - created
name: release (linux/amd64) name: release (linux)
jobs: jobs:
linux: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
include:
- arch: amd64
cc: gcc
- arch: arm64
cc: aarch64-linux-gnu-gcc
- arch: arm
cc: arm-linux-gnueabihf-gcc
env:
GOOS: linux
GOARCH: ${{ matrix.arch }}
CC: ${{ matrix.cc }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
@@ -16,6 +31,11 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
- name: Install cross-compilers
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
- name: Install nfpm - name: Install nfpm
run: | run: |
wget https://github.com/goreleaser/nfpm/releases/download/v2.2.3/nfpm_2.2.3_Linux_x86_64.tar.gz wget https://github.com/goreleaser/nfpm/releases/download/v2.2.3/nfpm_2.2.3_Linux_x86_64.tar.gz
@@ -23,14 +43,15 @@ jobs:
- name: Build litestream - name: Build litestream
run: | run: |
rm -rf dist
mkdir -p dist mkdir -p dist
cp etc/litestream.yml etc/litestream.service dist cp etc/litestream.yml etc/litestream.service dist
cat etc/nfpm.yml | LITESTREAM_VERSION=${{ steps.release.outputs.tag_name }} envsubst > dist/nfpm.yml cat etc/nfpm.yml | LITESTREAM_VERSION=${{ steps.release.outputs.tag_name }} envsubst > dist/nfpm.yml
go build -ldflags "-X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream go build -ldflags "-X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream
cd dist cd dist
tar -czvf litestream-${{ steps.release.outputs.tag_name }}-linux-amd64.tar.gz litestream 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 }}-linux-amd64.deb ../nfpm pkg --config nfpm.yml --packager deb --target litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb
- name: Upload release binary - name: Upload release binary
uses: actions/upload-release-asset@v1.0.2 uses: actions/upload-release-asset@v1.0.2
@@ -39,7 +60,7 @@ jobs:
with: with:
upload_url: ${{ steps.release.outputs.upload_url }} upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream asset_path: ./dist/litestream
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64 asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
- name: Upload release tarball - name: Upload release tarball
@@ -48,8 +69,8 @@ jobs:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
with: with:
upload_url: ${{ steps.release.outputs.upload_url }} upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-linux-amd64.tar.gz asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64.tar.gz asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz
asset_content_type: application/gzip asset_content_type: application/gzip
- name: Upload debian package - name: Upload debian package
@@ -58,6 +79,6 @@ jobs:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
with: with:
upload_url: ${{ steps.release.outputs.upload_url }} upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-linux-amd64.deb asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64.deb asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}.deb
asset_content_type: application/octet-stream asset_content_type: application/octet-stream

47
.github/workflows/release.linux_amd64_static.yml → .github/workflows/release.linux_static.yml vendored
View File

@@ -3,10 +3,25 @@ on:
types: types:
- created - created
name: release (linux/amd64-static) name: release (linux/static)
jobs: jobs:
linux: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
include:
- arch: amd64
cc: gcc
- arch: arm64
cc: aarch64-linux-gnu-gcc
- arch: arm
cc: arm-linux-gnueabihf-gcc
env:
GOOS: linux
GOARCH: ${{ matrix.arch }}
CC: ${{ matrix.cc }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
@@ -16,20 +31,18 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
- name: Install nfpm - name: Install cross-compilers
run: | run: |
wget https://github.com/goreleaser/nfpm/releases/download/v2.2.3/nfpm_2.2.3_Linux_x86_64.tar.gz sudo apt-get update
tar zxvf nfpm_2.2.3_Linux_x86_64.tar.gz sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
- name: Build litestream - name: Build litestream
run: | run: |
rm -rf dist
mkdir -p dist mkdir -p dist
cp etc/litestream.yml etc/litestream.service dist
cat etc/nfpm.yml | LITESTREAM_VERSION=${{ steps.release.outputs.tag_name }} envsubst > dist/nfpm.yml
go build -ldflags "-w -extldflags "-static" -X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream go build -ldflags "-w -extldflags "-static" -X 'main.Version=${{ steps.release.outputs.tag_name }}'" -o dist/litestream ./cmd/litestream
cd dist cd dist
tar -czvf litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.tar.gz litestream tar -czvf litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz litestream
../nfpm pkg --config nfpm.yml --packager deb --target litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.deb
- name: Upload release binary - name: Upload release binary
uses: actions/upload-release-asset@v1.0.2 uses: actions/upload-release-asset@v1.0.2
@@ -38,7 +51,7 @@ jobs:
with: with:
upload_url: ${{ steps.release.outputs.upload_url }} upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream asset_path: ./dist/litestream
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
- name: Upload release tarball - name: Upload release tarball
@@ -47,16 +60,6 @@ jobs:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
with: with:
upload_url: ${{ steps.release.outputs.upload_url }} upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.tar.gz asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.tar.gz asset_name: litestream-${{ steps.release.outputs.tag_name }}-${{ env.GOOS }}-${{ env.GOARCH }}-static.tar.gz
asset_content_type: application/gzip asset_content_type: application/gzip
- name: Upload debian package
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ github.token }}
with:
upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: ./dist/litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.deb
asset_name: litestream-${{ steps.release.outputs.tag_name }}-linux-amd64-static.deb
asset_content_type: application/octet-stream

8
Makefile
View File

@@ -3,9 +3,15 @@ default:
dist-linux: dist-linux:
mkdir -p dist mkdir -p dist
cp etc/litestream.yml dist/litestream.yml cp etc/litestream.yml dist/litestream.yml
docker run --rm -v "${PWD}":/usr/src/litestream -w /usr/src/litestream -e GOOS=linux -e GOARCH=amd64 golang:1.15 go build -v -o dist/litestream ./cmd/litestream docker run --rm -v "${PWD}":/usr/src/litestream -w /usr/src/litestream -e GOOS=linux -e GOARCH=amd64 golang:1.16 go build -v -o dist/litestream ./cmd/litestream
tar -cz -f dist/litestream-linux-amd64.tar.gz -C dist litestream tar -cz -f dist/litestream-linux-amd64.tar.gz -C dist litestream
dist-linux-arm:
docker run --rm -v "${PWD}":/usr/src/litestream -w /usr/src/litestream -e CGO_ENABLED=1 -e CC=arm-linux-gnueabihf-gcc -e GOOS=linux -e GOARCH=arm golang-xc:1.16 go build -v -o dist/litestream-linux-arm ./cmd/litestream
dist-linux-arm64:
docker run --rm -v "${PWD}":/usr/src/litestream -w /usr/src/litestream -e CGO_ENABLED=1 -e CC=aarch64-linux-gnu-gcc -e GOOS=linux -e GOARCH=arm64 golang-xc:1.16 go build -v -o dist/litestream-linux-arm64 ./cmd/litestream
dist-macos: dist-macos:
ifndef LITESTREAM_VERSION ifndef LITESTREAM_VERSION
$(error LITESTREAM_VERSION is undefined) $(error LITESTREAM_VERSION is undefined)

8
db.go
View File

@@ -1438,9 +1438,9 @@ func RestoreReplica(ctx context.Context, r Replica, opt RestoreOptions) error {
// Validate options. // Validate options.
if opt.OutputPath == "" { if opt.OutputPath == "" {
return fmt.Errorf("output path required") return fmt.Errorf("output path required")
} else if opt.Generation == "" && opt.Index != math.MaxInt64 { } else if opt.Generation == "" && opt.Index != math.MaxInt32 {
return fmt.Errorf("must specify generation when restoring to index") return fmt.Errorf("must specify generation when restoring to index")
} else if opt.Index != math.MaxInt64 && !opt.Timestamp.IsZero() { } else if opt.Index != math.MaxInt32 && !opt.Timestamp.IsZero() {
return fmt.Errorf("cannot specify index & timestamp to restore") return fmt.Errorf("cannot specify index & timestamp to restore")
} }
@@ -1733,7 +1733,7 @@ type RestoreOptions struct {
Generation string Generation string
// Specific index to restore from. // Specific index to restore from.
// Set to math.MaxInt64 to ignore index. // Set to math.MaxInt32 to ignore index.
Index int Index int
// Point-in-time to restore database. // Point-in-time to restore database.
@@ -1752,7 +1752,7 @@ type RestoreOptions struct {
// NewRestoreOptions returns a new instance of RestoreOptions with defaults. // NewRestoreOptions returns a new instance of RestoreOptions with defaults.
func NewRestoreOptions() RestoreOptions { func NewRestoreOptions() RestoreOptions {
return RestoreOptions{ return RestoreOptions{
Index: math.MaxInt64, Index: math.MaxInt32,
} }
} }

4
etc/nfpm.yml
View File

@@ -1,6 +1,6 @@
name: litestream name: litestream
arch: amd64 arch: "${GOARCH}"
platform: linux platform: "${GOOS}"
version: "${LITESTREAM_VERSION}" version: "${LITESTREAM_VERSION}"
section: "default" section: "default"
priority: "extra" priority: "extra"

2
replica.go
View File

@@ -1109,7 +1109,7 @@ func WALIndexAt(ctx context.Context, r Replica, generation string, maxIndex int,
} }
// If max index is specified but not found, return an error. // If max index is specified but not found, return an error.
if maxIndex != math.MaxInt64 && index != maxIndex { if maxIndex != math.MaxInt32 && index != maxIndex {
return index, fmt.Errorf("unable to locate index %d in generation %q, highest index was %d", maxIndex, generation, index) return index, fmt.Errorf("unable to locate index %d in generation %q, highest index was %d", maxIndex, generation, index)
} }
return index, nil return index, nil