From 89aebf918161c9fbc491f01d644feca8fe24602d Mon Sep 17 00:00:00 2001 From: NI Date: Mon, 27 Jul 2020 06:48:21 +0800 Subject: [PATCH] Remove `Overalls` from build process --- .ci.sh | 14 -------------- .github/workflows/workflow.yml | 3 +++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.ci.sh b/.ci.sh index 3d1d93a..1865fcb 100644 --- a/.ci.sh +++ b/.ci.sh @@ -3,7 +3,6 @@ PATH=$PATH:"$(go env GOPATH)/bin" GO111MODULE=on ASC_URL=https://keybase.io/nirui/pgp_keys.asc -PACKAGE=github.com/niruix/sshwifty VERSION_VARIABLE=github.com/niruix/sshwifty/application.version BUILD_TARGETS="darwin/amd64 windows/386 windows/amd64 openbsd/386 openbsd/amd64 openbsd/arm openbsd/arm64 freebsd/386 freebsd/amd64 freebsd/arm freebsd/arm64 linux/386 linux/amd64 linux/arm linux/arm64 linux/riscv64 linux/ppc64 linux/ppc64le linux/mips linux/mipsle linux/mips64 linux/mips64le" @@ -14,7 +13,6 @@ SSHWIFTY_VERSION=$(git describe --always --dirty='*' --tag) SSHWIFTY_COMMIT=$(git describe --always) SSHWIFTY_RELEASE=$([ "$(echo $SSHWIFTY_VERSION | grep -oP ^[0-9]+\.[0-9]+\.[0-9]+\-[a-zA-Z0-9]+\-release$)" = '' ] || echo 'yes') SSHWIFTY_DEPLOY=$([ "$SSHWIFTY_RELEASE" != 'yes' ] || echo 'yes') -SSHWIFTY_TEST_COVER=$([ "$COVERALLS_TOKEN" = '' ] || echo 'yes') SSHWIFTY_DOCKER_IMAGE_TAG="$DOCKER_HUB_USER/github_action_test" SSHWIFTY_DOCKER_IMAGE_PUSH_TAG="$SSHWIFTY_DOCKER_IMAGE_TAG:$SSHWIFTY_VERSION" SSHWIFTY_DOCKER_IMAGE_PUSH_TAG_LATEST="$SSHWIFTY_DOCKER_IMAGE_TAG:latest" @@ -74,13 +72,6 @@ catch() { exit $res } -if [ "$SSHWIFTY_TEST_COVER" = 'yes' ]; then - echo 'Downloading test cover reporter ...' - - [ "$(which overalls)" != '' ] || catch retry go get -v github.com/go-playground/overalls - [ "$(which goveralls)" != '' ] || catch retry go get -v github.com/mattn/goveralls -fi - if [ "$SSHWIFTY_DEPLOY" = 'yes' ]; then echo 'Downloading compile & deploy tools ...' @@ -103,11 +94,6 @@ catch npm run generate catch go vet ./... catch npm run testonly -if [ "$SSHWIFTY_TEST_COVER" = 'yes' ]; then - catch overalls -project="$PACKAGE" -covermode=count - catch goveralls -coverprofile=./overalls.coverprofile -service github -fi - if [ "$SSHWIFTY_DEPLOY" = 'yes' ]; then catch child \ ' diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c5e43ac..7f15dbc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -23,6 +23,9 @@ jobs: export DOCKER_HUB_PASSWORD="${{ secrets.DOCKER_HUB_PASSWORD }}" export COVERALLS_TOKEN="${{ secrets.COVERALLS_TOKEN }}" export DOCKER_HUB_USER="${{ github.repository_owner }}" + + # The `DOCKER_NPM_REGISTRY` is here due to problematic build process + # for ARM64 Docker Image caused by Docker/QEMU export DOCKER_NPM_REGISTRY="http://registry.npmjs.org/" sudo apt-get update -qq -y