From 0be18205c8e19f8efa45f2d4eb2d6935c42dc0d9 Mon Sep 17 00:00:00 2001 From: Brannon King Date: Thu, 19 Aug 2021 17:51:47 -0400 Subject: [PATCH] updating build scripts to not use ICU --- .github/workflows/basic-check.yml | 4 ---- .github/workflows/create-release.yml | 13 ++++++------- .github/workflows/full-sync-part-1.yml | 2 +- .github/workflows/full-sync-part-2.yml | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/basic-check.yml b/.github/workflows/basic-check.yml index 2762d73b..eaa27d1f 100644 --- a/.github/workflows/basic-check.yml +++ b/.github/workflows/basic-check.yml @@ -17,12 +17,8 @@ jobs: - name: Install Linters run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.26.0" - name: Build - env: - GO111MODULE: "on" run: go build ./... - name: Test - env: - GO111MODULE: "on" run: | sh ./goclean.sh diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 33528aca..bf1aa438 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -12,8 +12,9 @@ jobs: strategy: matrix: go: [1.16] - os: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ${{ matrix.os }} + os: [linux, darwin, windows] + ar: [amd64, arm64] + runs-on: ubuntu-latest steps: - name: Set up Go uses: actions/setup-go@v2 @@ -21,13 +22,11 @@ jobs: go-version: ${{ matrix.go }} - name: Checkout source uses: actions/checkout@v2 - - name: Install coreutils, ICU for macOS - if: matrix.os == 'macos-latest' - run: brew install coreutils icu4c - name: Build executables env: - GO111MODULE: "on" - run: go build -trimpath -o artifacts/ --tags use_icu_normalization . + GOOS: ${{ matrix.os }} + GOARCH: ${{ matrix.ar }} + run: go build -trimpath -o artifacts/ . - name: SHA256 sum run: sha256sum -b artifacts/* > artifacts/lbcd.sha256 - name: Upload artifacts diff --git a/.github/workflows/full-sync-part-1.yml b/.github/workflows/full-sync-part-1.yml index 6a643836..e920b097 100644 --- a/.github/workflows/full-sync-part-1.yml +++ b/.github/workflows/full-sync-part-1.yml @@ -25,7 +25,7 @@ jobs: - name: Checkout source uses: actions/checkout@v2 - name: Build lbcd - run: go build --tags use_icu_normalization . + run: go build . - name: Create datadir run: echo "TEMP_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV - name: Run lbcd diff --git a/.github/workflows/full-sync-part-2.yml b/.github/workflows/full-sync-part-2.yml index 52a58192..db81420f 100644 --- a/.github/workflows/full-sync-part-2.yml +++ b/.github/workflows/full-sync-part-2.yml @@ -25,7 +25,7 @@ jobs: - name: Checkout source uses: actions/checkout@v2 - name: Build lbcd - run: go build --tags use_icu_normalization . + run: go build . - name: Create datadir run: echo "TEMP_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV - name: Copy initial data